Prevent special characters finding their way into layout handle due to SKU being used.

This avoids page cache issue when Varnish tries to retrieve ESI with invalid URL on
product page.

Author: Marko-M

app/code/Magento/Catalog/Helper/Product/View.php

@@ -116,24 +116,26 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
             $pageConfig->setPageLayout($settings->getPageLayout());
         }
 
+        $urlSafeSku = rawurlencode($product->getSku());
+
         // Load default page handles and page configurations
         if ($params && $params->getBeforeHandles()) {
             foreach ($params->getBeforeHandles() as $handle) {
                 $resultPage->addPageLayoutHandles(
-                    ['id' => $product->getId(), 'sku' => $product->getSku(), 'type' => $product->getTypeId()],
+                    ['id' => $product->getId(), 'sku' => $urlSafeSku, 'type' => $product->getTypeId()],
                     $handle
                 );
             }
         }
 
         $resultPage->addPageLayoutHandles(
-            ['id' => $product->getId(), 'sku' => $product->getSku(), 'type' => $product->getTypeId()]
+            ['id' => $product->getId(), 'sku' => $urlSafeSku, 'type' => $product->getTypeId()]
         );
 
         if ($params && $params->getAfterHandles()) {
             foreach ($params->getAfterHandles() as $handle) {
                 $resultPage->addPageLayoutHandles(
-                    ['id' => $product->getId(), 'sku' => $product->getSku(), 'type' => $product->getTypeId()],
+                    ['id' => $product->getId(), 'sku' => $urlSafeSku, 'type' => $product->getTypeId()],
                     $handle
                 );
             }

app/code/Magento/Review/Controller/Product/ListAction.php

@@ -25,8 +25,10 @@ protected function _initProductLayout($product)
             $pageConfig->setPageLayout($product->getPageLayout());
         }
         $update = $this->_view->getLayout()->getUpdate();
+
+        $urlSafeSku = rawurlencode($product->getSku());
         $this->_view->addPageLayoutHandles(
-            ['id' => $product->getId(), 'sku' => $product->getSku(), 'type' => $product->getTypeId()]
+            ['id' => $product->getId(), 'sku' => $urlSafeSku, 'type' => $product->getTypeId()]
         );
 
         $this->_view->loadLayoutUpdates();