🐛 Reorder adding of page layout handles

Andreas Schrammel · Andreas Schrammel · commit 7819312f26c0 · 2017-12-18T17:02:57.000+01:00
Add type-dependent layout handels before more specific id/sku layout
handles.
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -122,18 +122,18 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
         // Load default page handles and page configurations
         if ($params && $params->getBeforeHandles()) {
             foreach ($params->getBeforeHandles() as $handle) {
-                $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
                 $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
+                $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
             }
         }
-
-        $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
+    
         $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
+        $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
 
         if ($params && $params->getAfterHandles()) {
             foreach ($params->getAfterHandles() as $handle) {
-                $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
                 $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
+                $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
             }
         }
 
diff --git a/app/code/Magento/Review/Controller/Product/ListAction.php b/app/code/Magento/Review/Controller/Product/ListAction.php
@@ -26,8 +26,8 @@ protected function getProductPage($product)
             $resultPage->getConfig()->setPageLayout($product->getPageLayout());
         }
         $urlSafeSku = rawurlencode($product->getSku());
-        $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
         $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
+        $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
         $resultPage->addUpdate($product->getCustomLayoutUpdate());
         return $resultPage;
     }

Original file line number	Diff line number	Diff line change
`@@ -122,18 +122,18 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu`
`122`	`122`	`// Load default page handles and page configurations`
`123`	`123`	`if ($params && $params->getBeforeHandles()) {`
`124`	`124`	`foreach ($params->getBeforeHandles() as $handle) {`
`125`		`- $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);`
`126`	`125`	`$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);`
	`126`	`+ $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);`
`127`	`127`	`}`
`128`	`128`	`}`
`129`		`-`
`130`		`- $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);`
	`129`	`+`
`131`	`130`	`$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);`
	`131`	`+ $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);`
`132`	`132`
`133`	`133`	`if ($params && $params->getAfterHandles()) {`
`134`	`134`	`foreach ($params->getAfterHandles() as $handle) {`
`135`		`- $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);`
`136`	`135`	`$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);`
	`136`	`+ $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ protected function getProductPage($product)`
`26`	`26`	`$resultPage->getConfig()->setPageLayout($product->getPageLayout());`
`27`	`27`	`}`
`28`	`28`	`$urlSafeSku = rawurlencode($product->getSku());`
`29`		`- $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);`
`30`	`29`	`$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);`
	`30`	`+ $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);`
`31`	`31`	`$resultPage->addUpdate($product->getCustomLayoutUpdate());`
`32`	`32`	`return $resultPage;`
`33`	`33`	`}`