Merge pull request #508 from magefan/8787-canonical-issue

add canonical tag check to avoid duplicates

Author: magefan

Block/Author/PostList.php

@@ -55,18 +55,21 @@ protected function _prepareLayout()
 
             if ($this->config->getDisplayCanonicalTag(\Magefan\Blog\Model\Config::CANONICAL_PAGE_TYPE_AUTHOR)) {
 
-                $canonicalUrl = $author->getAuthorUrl();
-                $page = (int)$this->_request->getParam(Toolbar::PAGE_PARM_NAME);
-                if ($page > 1) {
-                    $canonicalUrl .= ((false === strpos($canonicalUrl, '?')) ? '?' : '&')
-                        . Toolbar::PAGE_PARM_NAME . '=' . $page;
+                $layoutUpdate = $author->getData('layout_update_xml') ?: '';
+                if (false === strpos($layoutUpdate, 'rel="canonical"')) {
+                    $canonicalUrl = $author->getAuthorUrl();
+                    $page = (int)$this->_request->getParam(Toolbar::PAGE_PARM_NAME);
+                    if ($page > 1) {
+                        $canonicalUrl .= ((false === strpos($canonicalUrl, '?')) ? '?' : '&')
+                            . Toolbar::PAGE_PARM_NAME . '=' . $page;
+                    }
+
+                    $this->pageConfig->addRemotePageAsset(
+                        $canonicalUrl,
+                        'canonical',
+                        ['attributes' => ['rel' => 'canonical']]
+                    );
                 }
-
-                $this->pageConfig->addRemotePageAsset(
-                    $canonicalUrl,
-                    'canonical',
-                    ['attributes' => ['rel' => 'canonical']]
-                );
             }
             /*
             $page = $this->_request->getParam(\Magefan\Blog\Block\Post\PostList\Toolbar::PAGE_PARM_NAME);

Block/Post/View.php

@@ -43,12 +43,15 @@ protected function _prepareLayout()
             $this->pageConfig->setKeywords($post->getMetaKeywords());
             $this->pageConfig->setDescription($post->getMetaDescription());
 
-            if ($this->config->getDisplayCanonicalTag(\Magefan\Blog\Model\Config::CANONICAL_PAGE_TYPE_POST)) {
-                $this->pageConfig->addRemotePageAsset(
-                    $post->getCanonicalUrl(),
-                    'canonical',
-                    ['attributes' => ['rel' => 'canonical']]
-                );
+            $layoutUpdate = $post->getData('layout_update_xml') ?: '';
+            if (false === strpos($layoutUpdate, 'rel="canonical"')) {
+                if ($this->config->getDisplayCanonicalTag(\Magefan\Blog\Model\Config::CANONICAL_PAGE_TYPE_POST)) {
+                    $this->pageConfig->addRemotePageAsset(
+                        $post->getCanonicalUrl(),
+                        'canonical',
+                        ['attributes' => ['rel' => 'canonical']]
+                    );
+                }
             }
 
             $pageMainTitle = $this->getLayout()->getBlock('page.main.title');

Block/Tag/PostList.php

@@ -73,18 +73,21 @@ protected function _prepareLayout()
 
             if ($this->config->getDisplayCanonicalTag(\Magefan\Blog\Model\Config::CANONICAL_PAGE_TYPE_TAG)) {
 
-                $canonicalUrl = $tag->getTagUrl();
-                $page = (int)$this->_request->getParam(Toolbar::PAGE_PARM_NAME);
-                if ($page > 1) {
-                    $canonicalUrl .= ((false === strpos($canonicalUrl, '?')) ? '?' : '&')
-                        . Toolbar::PAGE_PARM_NAME . '=' . $page;
+                $layoutUpdate = $tag->getData('layout_update_xml') ?: '';
+                if (false === strpos($layoutUpdate, 'rel="canonical"')) {
+                    $canonicalUrl = $tag->getTagUrl();
+                    $page = (int)$this->_request->getParam(Toolbar::PAGE_PARM_NAME);
+                    if ($page > 1) {
+                        $canonicalUrl .= ((false === strpos($canonicalUrl, '?')) ? '?' : '&')
+                            . Toolbar::PAGE_PARM_NAME . '=' . $page;
+                    }
+
+                    $this->pageConfig->addRemotePageAsset(
+                        $canonicalUrl,
+                        'canonical',
+                        ['attributes' => ['rel' => 'canonical']]
+                    );
                 }
-
-                $this->pageConfig->addRemotePageAsset(
-                    $canonicalUrl,
-                    'canonical',
-                    ['attributes' => ['rel' => 'canonical']]
-                );
             }
 
             $pageMainTitle = $this->getLayout()->getBlock('page.main.title');