Merge pull request PrestaShop#21729 from micka-fdz/move-product-canon…

…ical Move product canonical url from tpl to controller
lfymcc · Dec 16, 2020 · 4e9fc2d · 4e9fc2d
2 parents 603fef9 + e4bfc32
commit 4e9fc2d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
@@ -25,6 +25,7 @@
  */
 use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
 use PrestaShop\PrestaShop\Adapter\Presenter\AbstractLazyArray;
+use PrestaShop\PrestaShop\Adapter\Presenter\Product\ProductLazyArray;
 use PrestaShop\PrestaShop\Adapter\Presenter\Product\ProductListingPresenter;
 use PrestaShop\PrestaShop\Adapter\Product\PriceFormatter;
 use PrestaShop\PrestaShop\Adapter\Product\ProductColorsRetriever;
@@ -83,6 +84,17 @@ public function canonicalRedirection($canonical_url = '')
         }
     }
 
+    public function getCanonicalURL(): string
+    {
+        $product = $this->context->smarty->getTemplateVars('product');
+
+        if (!($product instanceof ProductLazyArray)) {
+            return '';
+        }
+
+        return $product->getCanonicalUrl();
+    }
+
     /**
      * Initialize product controller.
      *

diff --git a/themes/classic/templates/catalog/product.tpl b/themes/classic/templates/catalog/product.tpl
@@ -24,10 +24,6 @@
  *}
 {extends file=$layout}
 
-{block name='head_seo' prepend}
-  <link rel="canonical" href="{$product.canonical_url}">
-{/block}
-
 {block name='head' append}
   <meta property="og:type" content="product">
   <meta property="og:url" content="{$urls.current_url}">