Merge remote-tracking branch '36244/patch-21' into octcommpr

engcom-Charlie · engcom-Charlie · commit 17f6230552f2 · 2025-02-13T15:06:06.000+05:30
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -178,16 +178,19 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
         if ($params && $params->getBeforeHandles()) {
             foreach ($params->getBeforeHandles() as $handle) {
                 $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
+                $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], $handle, false);
                 $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
             }
         }
 
         $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
+        $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], null, false);
         $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
 
         if ($params && $params->getAfterHandles()) {
             foreach ($params->getAfterHandles() as $handle) {
                 $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
+                $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], $handle, false);
                 $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -178,16 +178,19 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu`
`178`	`178`	`if ($params && $params->getBeforeHandles()) {`
`179`	`179`	`foreach ($params->getBeforeHandles() as $handle) {`
`180`	`180`	`$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);`
	`181`	`+ $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], $handle, false);`
`181`	`182`	`$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);`
`182`	`183`	`}`
`183`	`184`	`}`
`184`	`185`
`185`	`186`	`$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);`
	`187`	`+ $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], null, false);`
`186`	`188`	`$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);`
`187`	`189`
`188`	`190`	`if ($params && $params->getAfterHandles()) {`
`189`	`191`	`foreach ($params->getAfterHandles() as $handle) {`
`190`	`192`	`$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);`
	`193`	`+ $resultPage->addPageLayoutHandles(['attribute_set' => $product->getAttributeSetId()], $handle, false);`
`191`	`194`	`$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);`
`192`	`195`	`}`
`193`	`196`	`}`