Merge pull request #394 from bugfolder/336_fix_url_aliases

Issue #336: Fix disappearing product URL aliases

uc_cart/uc_cart.controller.inc

@@ -17,6 +17,9 @@ class UcCartItemController extends EntityPlusController {
         foreach ($product as $key => $value) {
           $item->$key = $value;
         }
+        // UcCartItem should not have a path (inherited from the node) so that
+        // path module doesn't try to update the node's alias.
+        unset($item->path);
       }
       $item->module = $item->data['module'];
     }
@@ -67,6 +70,11 @@ class UcCartItem extends Entity {
    */
   public $cart_item_id;
 
+  function __construct(array $values = array()) {
+    parent::__construct($values);
+    unset($this->path);
+  }
+
   /**
    * Implements EntityInterface::id().
    */
@@ -92,11 +100,7 @@ class UcCartItem extends Entity {
    * Implements EntityInterface::uri().
    */
   public function uri() {
-    // Since uc_order_product entities are derived from nodes, we return the uri
-    // of its "parent" node.
-    return array(
-       'path' => 'node/' . $this->nid,
-       'options' => array(),
-    );
+    // Only used internally, so doesn't have a URI.
+    return NULL;
   }
 }

uc_order/uc_order.entity.inc

@@ -117,6 +117,17 @@ class UcOrder extends Entity {
  */
 class UcOrderProduct extends Entity {
 
+  /**
+   * Constructor.
+   */
+  public function __construct(array $values) {
+    parent::__construct($values);
+
+    // UcOrderProduct should not have a path set; if it does, pathauto tries to
+    // update an alias for the entity.
+    unset($this->path);
+  }
+
   /**
    * The node ID.
    *
@@ -156,11 +167,7 @@ class UcOrderProduct extends Entity {
    * Implements EntityInterface::uri().
    */
   public function uri() {
-    // Since uc_order_product entities are derived from nodes, we return the uri
-    // of its "parent" node.
-    return array(
-      'path' => 'node/' . $this->nid,
-      'options' => array(),
-    );
+    // UcOrderProduct is only used internally, so doesn't have a URI.
+    return NULL;
   }
 }

uc_order/uc_order.module

@@ -1040,6 +1040,14 @@ function uc_order_product_save($order_id, $product) {
     $product->is_new = TRUE;
   }
 
+  // It's possible that a contrib or custom module updated the order's products
+  // and assigned the product's path variable from the node. In case that
+  // happened, we'll unset it here so that path module doesn't try to update the
+  // node's alias via path_entity_update().
+  unset($product->path);
+
+  // Note that $product can be a UcOrderProduct or a UcCartItem, but we use
+  // the UcOrderProductController class in either case.
   return entity_get_controller('uc_order_product')->save($product);
 }
 
@@ -1184,6 +1192,9 @@ function uc_order_product_revive($products, $published = TRUE) {
           $product->$key = $value;
         }
       }
+      // uc_order_product entities should not have a path (inherited from the
+      // node) so that path module doesn't try to update the node's alias.
+      unset($product->path);
       // Order products are always variants.
       $product->variant = TRUE;
     }