=== modified file 'docs/hooks.php'
--- docs/hooks.php	2009-01-30 21:55:39 +0000
+++ docs/hooks.php	2009-02-13 19:07:17 +0000
@@ -1134,7 +1134,7 @@
 function hook_ucga_display() {
   // Tell UC Google Analytics to display the e-commerce JS on the custom
   // order completion page for this module.
-  if (arg(0) == 'cart' && arg(1) == '2checkout' && arg(2) == 'complete') {
+  if (arg(0) == 'uc-cart' && arg(1) == '2checkout' && arg(2) == 'complete') {
     return TRUE;
   }
 }
@@ -1219,7 +1219,7 @@
 
   // Rebuild the items hash
   uc_cart_get_contents(NULL, 'rebuild');
-  if (!strpos(request_uri(), 'cart', -4)) {
+  if (!strpos(request_uri(), 'uc-cart', -7)) {
     drupal_set_message(t('Your item(s) have been updated.'));
   }
 }

=== modified file 'payment/uc_2checkout/uc_2checkout.module'
--- payment/uc_2checkout/uc_2checkout.module	2009-01-09 19:46:02 +0000
+++ payment/uc_2checkout/uc_2checkout.module	2009-02-13 19:47:03 +0000
@@ -40,7 +40,7 @@
 function uc_2checkout_ucga_display() {
   // Tell UC Google Analytics to display the e-commerce JS on the custom
   // order completion page for this module.
-  if (arg(0) == 'cart' && arg(1) == '2checkout' && arg(2) == 'complete') {
+  if (arg(0) == 'uc-cart' && arg(1) == '2checkout' && arg(2) == 'complete') {
     return TRUE;
   }
 }

=== modified file 'payment/uc_credit/uc_credit.module'
--- payment/uc_credit/uc_credit.module	2009-02-03 14:32:57 +0000
+++ payment/uc_credit/uc_credit.module	2009-02-13 19:44:37 +0000
@@ -355,7 +355,7 @@
  * Implementation of hook_payment_method().
  */
 function uc_credit_payment_method() {
-  if (arg(0) == 'cart' && uc_credit_encryption_key() === FALSE) {
+  if (arg(0) == 'uc-cart' && uc_credit_encryption_key() === FALSE) {
     return;
   }
 
@@ -901,7 +901,7 @@
 // Displays the credit card details form on the checkout screen.
 function uc_payment_method_credit_form($form_state, $order) {
   // Normally the CC data is posted in via AJAX.
-  if (!empty($_POST['payment-details-data']) && arg(0) == 'cart') {
+  if (!empty($_POST['payment-details-data']) && arg(0) == 'uc-cart') {
     $order->payment_details = uc_credit_cache('save', $_POST['payment-details-data']);
   }
 

=== modified file 'payment/uc_google_checkout/uc_google_checkout.module'
--- payment/uc_google_checkout/uc_google_checkout.module	2009-02-04 22:14:23 +0000
+++ payment/uc_google_checkout/uc_google_checkout.module	2009-02-13 19:44:43 +0000
@@ -565,7 +565,7 @@
       $output .= '</tax-tables>';
     }
 
-    $output .= '<edit-cart-url>'. url('cart', array('absolute' => TRUE)) .'</edit-cart-url>';
+    $output .= '<edit-cart-url>'. url('uc-cart', array('absolute' => TRUE)) .'</edit-cart-url>';
     if (($page = variable_get('uc_continue_shopping_url', '')) != '<none>') {
       $output .= '<continue-shopping-url>'. url($page, array('absolute' => TRUE)) .'</continue-shopping-url>';
     }

=== modified file 'payment/uc_paypal/uc_paypal.module'
--- payment/uc_paypal/uc_paypal.module	2008-12-31 15:29:51 +0000
+++ payment/uc_paypal/uc_paypal.module	2009-02-13 19:45:38 +0000
@@ -571,7 +571,7 @@
   if ($order === FALSE || uc_order_status_data($order->order_status, 'state') != 'in_checkout') {
     $_SESSION['cart_order'] = NULL;
     unset($_SESSION['cart_order']);
-    drupal_goto('cart');
+    drupal_goto('uc-cart');
   }
 
   list($desc, $subtotal) = _uc_paypal_product_details($order->products);

=== modified file 'payment/uc_paypal/uc_paypal.pages.inc'
--- payment/uc_paypal/uc_paypal.pages.inc	2008-12-17 22:37:57 +0000
+++ payment/uc_paypal/uc_paypal.pages.inc	2009-02-13 19:47:01 +0000
@@ -141,7 +141,7 @@
     unset($_SESSION['have_details']);
     unset($_SESSION['TOKEN'], $_SESSION['PAYERID']);
     drupal_set_message(t('An error has occurred in your PayPal payment. Please review your cart and try again.'));
-    drupal_goto('cart');
+    drupal_goto('uc-cart');
   }
 
   $nvp_request = array(
@@ -163,7 +163,7 @@
     unset($_SESSION['have_details']);
     unset($_SESSION['TOKEN'], $_SESSION['PAYERID']);
     drupal_set_message(t('An error has occurred in your PayPal payment. Please review your cart and try again.'));
-    drupal_goto('cart');
+    drupal_goto('uc-cart');
   }
 
   if ($_SESSION['have_details'][$order->order_id] !== TRUE) {
@@ -352,7 +352,7 @@
     unset($_SESSION['cart_order'], $_SESSION['have_details']);
     unset($_SESSION['TOKEN'], $_SESSION['PAYERID']);
     drupal_set_message(t('An error has occurred in your PayPal payment. Please review your cart and try again.'));
-    drupal_goto('cart');
+    drupal_goto('uc-cart');
   }
 
   drupal_add_css(drupal_get_path('module', 'uc_cart') .'/uc_cart.css');
@@ -381,7 +381,7 @@
   }
 
   if (!($order = uc_order_load($order_id))) {
-    drupal_goto('cart');
+    drupal_goto('uc-cart');
   }
 
   // This lets us know it's a legitimate access of the complete page.
@@ -396,6 +396,6 @@
 
   drupal_set_message(t('Your PayPal payment was cancelled. Please feel free to continue shopping or contact us for assistance.'));
 
-  drupal_goto('cart');
+  drupal_goto('uc-cart');
 }
 

=== modified file 'shipping/uc_quote/uc_quote.js'
--- shipping/uc_quote/uc_quote.js	2009-02-12 18:07:59 +0000
+++ shipping/uc_quote/uc_quote.js	2009-02-13 19:46:55 +0000
@@ -125,7 +125,7 @@
     if (data[i].rate != undefined || data[i].error || data[i].notes) {
 
       if (data[i].rate != undefined) {
-        if (numQuotes > 1 && page != 'cart') {
+        if (numQuotes > 1 && page != 'uc-cart') {
           item = "<input type=\"hidden\" name=\"rate[" + i + "]\" value=\"" + (Math.round(data[i].rate * 100) / 100) + "\" />"
             + "<label class=\"option\">"
             + "<input type=\"radio\" class=\"form-radio\" name=\"quote-option\" value=\"" + i + "\" />"

=== modified file 'uc_attribute/uc_attribute.admin.inc'
--- uc_attribute/uc_attribute.admin.inc	2009-02-10 21:51:13 +0000
+++ uc_attribute/uc_attribute.admin.inc	2009-02-13 19:01:36 +0000
@@ -515,7 +515,7 @@
     $form['add'] = array(
       '#type' => 'submit',
       '#value' => t('Add attributes'),
-      '#suffix' => l(t('Cancel'), $type == 'product' ? 'node/'. $id .'/edit/attributes' : 'admin/store/products/classes/'. $class->pcid .'/attributes'),
+      '#suffix' => l(t('Cancel'), $type == 'product' ? 'node/'. $id .'/edit/uc-attributes' : 'admin/store/products/classes/'. $class->pcid .'/attributes'),
       '#weight' => 0,
     );
   }
@@ -644,7 +644,7 @@
   }
 
   if ($form_state['values']['type'] == 'product') {
-    $form_state['redirect'] = 'node/'. $form_state['values']['id'] .'/edit/attributes';
+    $form_state['redirect'] = 'node/'. $form_state['values']['id'] .'/edit/uc-attributes';
   }
   else {
     $form_state['redirect'] = 'admin/store/products/classes/'. $form_state['values']['id'] .'/attributes';

=== modified file 'uc_attribute/uc_attribute.module'
--- uc_attribute/uc_attribute.module	2009-02-13 17:03:07 +0000
+++ uc_attribute/uc_attribute.module	2009-02-13 19:03:06 +0000
@@ -23,23 +23,23 @@
 function uc_attribute_help($path, $arg) {
   switch ($path) {
     // Help messages for the attributes overview on products and classes.
-    case 'node/%/edit/attributes':
-      return t('Add attributes to this product using the <a href="!url">add attributes form</a>. You may then adjust the settings for these attributes on this page and go on to configure their options in the <em>Options</em> tab.', array('!url' => url('node/'. $arg[1] .'/edit/attributes/add')));
+    case 'node/%/edit/uc-attributes':
+      return t('Add attributes to this product using the <a href="!url">add attributes form</a>. You may then adjust the settings for these attributes on this page and go on to configure their options in the <em>Options</em> tab.', array('!url' => url('node/'. $arg[1] .'/edit/uc-attributes/add')));
     case 'admin/store/products/classes/%/attributes':
       return t('Add attributes to the product class using the <a href="!url">add attributes form</a>. You may then adjust the settings for these attributes on this page and go on to configure their options in the <em>Options</em> tab.', array('!url' => url('admin/store/products/classes/'. $arg[4] .'/attributes/add')));
 
     // Help message for adding an attribute to a product or class.
-    case 'node/%/edit/attributes/add':
+    case 'node/%/edit/uc-attributes/add':
     case 'admin/store/products/classes/%/attributes/add':
       return t('Select the attributes you want to add and submit the form.');
 
     // Help message for adjusting the options on a product or class.
-    case 'node/%/edit/options':
+    case 'node/%/edit/uc-options':
     case 'admin/store/products/classes/%/options':
       return t('Use the checkboxes to enable options for attributes and the radio buttons to specify defaults for the enabled options. Use the other fields to override the default settings for each option. Attributes with no enabled options will be displayed as text fields.');
 
     // Help message for the product Adjustments tab.
-    case 'node/%/edit/adjustments':
+    case 'node/%/edit/uc-adjustments':
       return t('Enter an alternate SKU to be used when the specified set of options are chosen and the product is added to the cart. <b>Warning:</b> Adding or removing attributes from this product will reset all the SKUs on this page to the default product SKU.');
   }
 }
@@ -156,7 +156,7 @@
   );
 
   // Insert subitems into the edit node page for product types.
-  $items['node/%node/edit/attributes'] = array(
+  $items['node/%node/edit/uc-attributes'] = array(
     'title' => 'Attributes',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_object_attributes_form', 1, 'product', 'overview'),
@@ -166,7 +166,7 @@
     'weight' => 1,
     'file' => 'uc_attribute.admin.inc',
   );
-  $items['node/%node/edit/attributes/add'] = array(
+  $items['node/%node/edit/uc-attributes/add'] = array(
     'title' => 'Attributes',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_object_attributes_form', 1, 'product', 'add'),
@@ -176,7 +176,7 @@
     'weight' => 1,
     'file' => 'uc_attribute.admin.inc',
   );
-  $items['node/%node/edit/options'] = array(
+  $items['node/%node/edit/uc-options'] = array(
     'title' => 'Options',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_object_options_form', 1, 'product'),
@@ -186,7 +186,7 @@
     'weight' => 2,
     'file' => 'uc_attribute.admin.inc',
   );
-  $items['node/%node/edit/adjustments'] = array(
+  $items['node/%node/edit/uc-adjustments'] = array(
     'title' => 'Adjustments',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('uc_product_adjustments_form', 1),

=== modified file 'uc_cart/uc_cart.admin.inc'
--- uc_cart/uc_cart.admin.inc	2009-01-30 21:55:39 +0000
+++ uc_cart/uc_cart.admin.inc	2009-02-13 19:42:01 +0000
@@ -45,8 +45,8 @@
     '#type' => 'textfield',
     '#title' => t('Add to cart redirect'),
     '#description' => t('Enter the Drupal page to redirect to when a customer adds an item to their cart.<br />Enter &lt;none&gt; for no redirect.'),
-    '#summary' => t('Add to cart is redirecting to <br /><a href="!url">!url</a>', array('!url' => url(variable_get('uc_add_item_redirect', 'cart'), array('absolute' => TRUE)))),
-    '#default_value' => variable_get('uc_add_item_redirect', 'cart'),
+    '#summary' => t('Add to cart is redirecting to <br /><a href="!url">!url</a>', array('!url' => url(variable_get('uc_add_item_redirect', 'uc-cart'), array('absolute' => TRUE)))),
+    '#default_value' => variable_get('uc_add_item_redirect', 'uc-cart'),
     '#size' => 32,
     '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
   );

=== modified file 'uc_cart/uc_cart.install'
--- uc_cart/uc_cart.install	2008-10-13 18:26:36 +0000
+++ uc_cart/uc_cart.install	2009-02-13 19:42:27 +0000
@@ -89,3 +89,15 @@
 
   return $ret;
 }
+
+function uc_cart_update_6001() {
+  $ret = array();
+  
+  // Namespace /cart to /uc-cart
+  if (variable_get('uc_add_item_redirect', '') == 'cart') {
+    variable_set('uc_add_item_redirect', 'uc-cart');
+    $ret[] = array('query' => 'Add item redirect page updated from "cart" to "uc-cart"', 'success' => TRUE);
+  }
+
+  return $ret;
+}

=== modified file 'uc_cart/uc_cart.module'
--- uc_cart/uc_cart.module	2009-02-13 15:43:12 +0000
+++ uc_cart/uc_cart.module	2009-02-13 19:42:46 +0000
@@ -138,7 +138,7 @@
     'file' => 'uc_cart.admin.inc',
   );
 
-  $items['cart'] = array(
+  $items['uc-cart'] = array(
     'title' => 'Shopping cart',
     'description' => 'View/modify the contents of your shopping cart or proceed to checkout.',
     'page callback' => 'uc_cart_view',
@@ -275,7 +275,7 @@
 function uc_cart_exit() {
   global $base_root;
 
-  $pages = array('cart', 'cart/checkout', 'cart/checkout/review', 'cart/checkout/complete');
+  $pages = array('uc-cart', 'uc-cart/checkout', 'uc-cart/checkout/review', 'uc-cart/checkout/complete');
   $this_page = request_uri();
   foreach ($pages as $page) {
     if ($page && strstr($this_page, $page) !== FALSE) {
@@ -471,7 +471,7 @@
           $summary_links = array(
             'cart-block-view-cart' => array(
               'title' => 'View cart',
-              'href' => 'cart',
+              'href' => 'uc-cart',
               'attributes' => array('rel' => 'nofollow'),
             ),
           );
@@ -598,7 +598,7 @@
  * @ingroup themeable
  */
 function theme_uc_cart_block_title_icon($cart_image) {
-  return l(theme('image', $cart_image, '', t('Shopping cart'), array('id' => 'block-cart-title-image')), 'cart', array('html' => TRUE));
+  return l(theme('image', $cart_image, '', t('Shopping cart'), array('id' => 'block-cart-title-image')), 'uc-cart', array('html' => TRUE));
 }
 
  /**
@@ -607,7 +607,7 @@
  * @ingroup themeable
  */
 function theme_uc_cart_block_content_cachable() {
-  return t('<a href="!url">View</a> your shopping cart.', array('!url' => url('cart')));
+  return t('<a href="!url">View</a> your shopping cart.', array('!url' => url('uc-cart')));
 }
 
 /**
@@ -955,7 +955,7 @@
 
     // Checkout button.
     case t('Checkout'):
-      $form_state['redirect'] = variable_get('uc_checkout_enabled', TRUE) ? 'cart/checkout' : 'cart';
+      $form_state['redirect'] = variable_get('uc_checkout_enabled', TRUE) ? 'uc-cart/checkout' : 'uc-cart';
       break;
   }
 }
@@ -1299,7 +1299,7 @@
             if (isset($_GET['destination'])) {
               drupal_goto();
             }
-            $redirect = variable_get('uc_add_item_redirect', 'cart');
+            $redirect = variable_get('uc_add_item_redirect', 'uc-cart');
             if ($redirect != '<none>') {
               $_SESSION['uc_cart_last_url'] = uc_referer_uri();
               return $redirect;
@@ -1323,7 +1323,7 @@
   if (is_null($item) || $item === FALSE) {
     db_query("INSERT INTO {uc_cart_products} (cart_id, nid, qty, changed, data) VALUES ('%s', %d, %d, %d, '%s')", $cid, $node->nid, $qty, time(), serialize($data));
     if ($msg) {
-        drupal_set_message(t('<strong>@product-title</strong> added to <a href="!url">your shopping cart</a>.', array('@product-title' => $node->title, '!url' => url('cart'))));
+        drupal_set_message(t('<strong>@product-title</strong> added to <a href="!url">your shopping cart</a>.', array('@product-title' => $node->title, '!url' => url('uc-cart'))));
     }
   }
   else {
@@ -1340,7 +1340,7 @@
       drupal_goto();
     }
 
-    $redirect = variable_get('uc_add_item_redirect', 'cart');
+    $redirect = variable_get('uc_add_item_redirect', 'uc-cart');
     if ($redirect != '<none>') {
       $_SESSION['uc_cart_last_url'] = uc_referer_uri();
       return $redirect;

=== modified file 'uc_cart/uc_cart.pages.inc'
--- uc_cart/uc_cart.pages.inc	2009-02-13 15:43:12 +0000
+++ uc_cart/uc_cart.pages.inc	2009-02-13 19:43:45 +0000
@@ -54,7 +54,7 @@
 
   $items = uc_cart_get_contents();
   if (count($items) == 0 || !variable_get('uc_checkout_enabled', TRUE)) {
-    drupal_goto('cart');
+    drupal_goto('uc-cart');
   }
 
   if (($min = variable_get('uc_minimum_subtotal', 0)) > 0) {
@@ -70,7 +70,7 @@
     }
     if ($subtotal < $min) {
       drupal_set_message(variable_get('uc_minimum_subtotal_text', t('The minimum order subtotal for checkout is !min.', array('!min' => uc_currency_format($min)))), 'error');
-      drupal_goto('cart');
+      drupal_goto('uc-cart');
     }
   }
 
@@ -107,7 +107,7 @@
       uc_order_comment_save($_SESSION['cart_order'], 0, t('Customer cancelled this order from the checkout form.'));
       unset($_SESSION['cart_order']);
     }
-    drupal_goto('cart');
+    drupal_goto('uc-cart');
   }
 
   $order = uc_order_load($_SESSION['cart_order']);
@@ -435,7 +435,7 @@
 
 function uc_cart_checkout_complete() {
   if (!$_SESSION['do_complete']) {
-    drupal_goto('cart');
+    drupal_goto('uc-cart');
   }
 
   $order = uc_order_load(intval($_SESSION['cart_order']));
@@ -444,7 +444,7 @@
     // Display messages to customers and the administrator if the order was lost.
     drupal_set_message(t("We're sorry.  An error occurred while processing your order that prevents us from completing it at this time. Please contact us and we will resolve the issue as soon as possible."), 'error');
     watchdog('uc_cart', 'An empty order made it to checkout! Cart order ID: @cart_order', array('@cart_order' => $_SESSION['cart_order']), WATCHDOG_ERROR);
-    drupal_goto('cart');
+    drupal_goto('uc-cart');
   }
 
   $output = uc_cart_complete_sale($order, variable_get('uc_new_customer_login', FALSE));

=== modified file 'uc_googleanalytics/uc_googleanalytics.module'
--- uc_googleanalytics/uc_googleanalytics.module	2009-02-03 20:01:11 +0000
+++ uc_googleanalytics/uc_googleanalytics.module	2009-02-13 19:43:56 +0000
@@ -49,7 +49,7 @@
  */
 function uc_googleanalytics_order($op, &$arg1, $arg2) {
   // If a new order is created during the checkout process...
-  if ($op == 'new' && arg(0) == 'cart') {
+  if ($op == 'new' && arg(0) == 'uc-cart') {
     // Store the order ID for later use.
     $_SESSION['ucga_order_id'] = $arg1->order_id;
   }
@@ -64,7 +64,7 @@
  */
 function uc_googleanalytics_display() {
   // Display the GA e-commerce JS if the URL is cart/checkout/complete...
-  if (arg(0) == 'cart' && arg(1) == 'checkout' && arg(2) == 'complete') {
+  if (arg(0) == 'uc-cart' && arg(1) == 'checkout' && arg(2) == 'complete') {
     return TRUE;
   }
 

=== modified file 'uc_product_kit/uc_product_kit.module'
--- uc_product_kit/uc_product_kit.module	2009-02-10 21:51:13 +0000
+++ uc_product_kit/uc_product_kit.module	2009-02-13 19:44:17 +0000
@@ -587,7 +587,7 @@
  */
 function uc_product_kit_add_to_cart_form_submit($form, &$form_state) {
   $node = node_load($form_state['values']['nid']);
-  drupal_set_message(t('<strong>@product-title</strong> added to <a href="!url">your shopping cart</a>.', array('@product-title' => $node->title, '!url' => url('cart'))));
+  drupal_set_message(t('<strong>@product-title</strong> added to <a href="!url">your shopping cart</a>.', array('@product-title' => $node->title, '!url' => url('uc-cart'))));
   $form_state['redirect'] = uc_cart_add_item($form_state['values']['nid'], $form_state['values']['qty'], $form_state['values']);
 }
 
@@ -694,7 +694,7 @@
         drupal_goto();
       }
 
-      $redirect = variable_get('uc_add_item_redirect', 'cart');
+      $redirect = variable_get('uc_add_item_redirect', 'uc-cart');
       if ($redirect != '<none>') {
         $_SESSION['last_url'] = uc_referer_uri();
         return $redirect;