Fixed issues in last commit

Author: ihorvansach

Controller/Router.php

@@ -155,32 +155,39 @@ public function match(\Magento\Framework\App\RequestInterface $request)
         unset($pathInfo[0]);
 
         if (!count($pathInfo)) {
-            $request->setControllerName('index')->setActionName('index');
+            $request
+                ->setModuleName('blog')
+                ->setControllerName('index')
+                ->setActionName('index');
         } elseif ($pathInfo[1] == $this->_url->getRoute(Url::CONTROLLER_RSS)) {
             $request
                 ->setModuleName('blog')
                 ->setControllerName(Url::CONTROLLER_RSS)
-                ->setActionName(isset($info[2]) ? $info[2] : 'index');
-        } elseif ($pathInfo[1] == $this->_url->getRoute(Url::CONTROLLER_SEARCH)) {
+                ->setActionName(isset($pathInfo[2]) ? $pathInfo[2] : 'index');
+        } elseif ($pathInfo[1] == $this->_url->getRoute(Url::CONTROLLER_SEARCH)
+            && !empty($pathInfo[2])
+        ) {
             $request
                 ->setModuleName('blog')
                 ->setControllerName(Url::CONTROLLER_SEARCH)
                 ->setActionName('index')
-                ->setParams('q', $pathInfo[2]);
+                ->setParam('q', $pathInfo[2]);
         } elseif ($pathInfo[1] == $this->_url->getRoute(Url::CONTROLLER_AUTHOR)
-            && ($authorId = $this->_getAuthorId($info[2]))
+            && !empty($pathInfo[2])
+            && ($authorId = $this->_getAuthorId($pathInfo[2]))
         ) {
             $request
                 ->setModuleName('blog')
                 ->setControllerName(Url::CONTROLLER_AUTHOR)
                 ->setActionName('view')
-                ->setParam('id', $$authorId);
+                ->setParam('id', $authorId);
         } elseif ($pathInfo[1] == $this->_url->getRoute(Url::CONTROLLER_TAG)
-            && $tagId = $this->_getTagId($info[2])
+            && !empty($pathInfo[2])
+            && $tagId = $this->_getTagId($pathInfo[2])
         ) {
             $request
                 ->setModuleName('blog')
-                ->setControllerName(Url::CONTROLLER_AUTHOR)
+                ->setControllerName(Url::CONTROLLER_TAG)
                 ->setActionName('view')
                 ->setParam('id', $tagId);
         } else {

Model/Category.php

@@ -319,7 +319,7 @@ public function getCategoryUrl()
      */
     public function getCanonicalUrl()
     {
-        return $this->_url->getUrl($this->getIdentifier(), $this->controllerName);
+        return $this->_url->getCanonicalUrl($this);
     }
 
     /**

Model/Post.php

@@ -266,7 +266,7 @@ public function getPostUrl()
      */
     public function getCanonicalUrl()
     {
-        return $this->_url->getUrl($this->getIdentifier(), $this->controllerName);
+        return $this->_url->getCanonicalUrl($this);
     }
 
     /**

Model/Url.php

@@ -152,11 +152,56 @@ public function getUrl($identifier, $controllerName)
             '_direct' => $this->getUrlPath($identifier, $controllerName)
         ]);
 
-        $url =  trim($url, '/');
+        return $url;
+    }
+
+    /**
+     * Retrieve canonical url
+     * @param \Magento\Framework\Model\AbstractModel $object
+     * @return string
+     */
+    public function getCanonicalUrl(\Magento\Framework\Model\AbstractModel $object)
+    {
+        $storeIds = $object->getStoreIds();
+        $useDefaultStore = false;
+        $currentStore = $this->_storeManager->getStore($object->getStoreId());
+
+        if (is_array($storeIds)) {
+            if (0 == array_values($storeIds)[0]) {
+                $useDefaultStore = true;
+            } elseif (count($storeIds > 1)) {
+                foreach ($storeIds as $storeId) {
+                    if ($storeId != $currentStore->getId()) {
+                        $store = $this->_storeManager->getStore($storeId);
+                        if ($store->getGroupId() == $currentStore->getGroupId()) {
+                            $useDefaultStore = true;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        $storeChanged = false;
+        if ($useDefaultStore) {
+            $newStore = $currentStore->getGroup()->getDefaultStore();
+            $origStore = $this->_url->getScope();
+            if ($newStore->getId() != $origStore->getId()) {
+                $this->_url->setScope($newStore);
+                $storeChanged = true;
+            }
+        }
+
+        $url = $this->getUrl($object->getIdentifier(), $object->getControllerName());
+
+        if ($storeChanged) {
+            $this->_url->setScope($origStore);
+        }
 
         return $url;
     }
 
+
     /**
      * Retrieve blog url path
      * @param  string $identifier
@@ -168,16 +213,16 @@ public function getUrlPath($identifier, $controllerName)
         $identifier = $this->getExpandedItentifier($identifier);
         switch ($this->getPermalinkType()) {
             case self::PERMALINK_TYPE_DEFAULT :
-                $path = $this->getRoute() . '/' . $this->getRoute($controllerName) . '/' . $identifier;
+                $path = $this->getRoute() . '/' . $this->getRoute($controllerName) . '/' . $identifier . ( $identifier ? '/' : '');
                 break;
             case self::PERMALINK_TYPE_SHORT :
                 if ($controllerName == self::CONTROLLER_SEARCH
                     || $controllerName == self::CONTROLLER_AUTHOR
                     || $controllerName == self::CONTROLLER_TAG
                 ) {
-                    $path = $this->getRoute() . '/' . $this->getRoute($controllerName) . '/' . $identifier;
+                    $path = $this->getRoute() . '/' . $this->getRoute($controllerName) . '/' . $identifier . ( $identifier ? '/' : '');
                 } else {
-                    $path = $this->getRoute() . '/' . $identifier;
+                    $path = $this->getRoute() . '/' . $identifier . ( $identifier ? '/' : '');
                 }
                 break;
         }
@@ -297,4 +342,5 @@ protected function _getConfig($key)
         );
     }
 
+
 }