Fixed 404 page on blog search page when search key is empty and custom blog route is used

Author: ihorvansach

Controller/Router.php

@@ -287,7 +287,7 @@ public function match(\Magento\Framework\App\RequestInterface $request)
 
         $_identifier = trim($request->getPathInfo(), '/');
         $blogPage = $this->urlResolver->resolve($_identifier);
-        if (!$blogPage || empty($blogPage['type']) || empty($blogPage['id'])) {
+        if (!$blogPage || empty($blogPage['type']) || (empty($blogPage['id']) && $blogPage['type'] != Url::CONTROLLER_SEARCH)) {
             return null;
         }
 

Model/UrlResolver.php

@@ -103,10 +103,8 @@ public function resolve($path)
             if (!isset($pathInfo[2]) || in_array($pathInfo[2], ['index', 'feed'])) {
                 return ['id' => 1, 'type' => Url::CONTROLLER_RSS];
             }
-        } elseif ($pathInfo[1] == $this->url->getRoute(Url::CONTROLLER_SEARCH)
-            && !empty($pathInfo[2])
-        ) {
-            return ['id' => $pathInfo[2], 'type' => Url::CONTROLLER_SEARCH];
+        } elseif ($pathInfo[1] == $this->url->getRoute(Url::CONTROLLER_SEARCH)) {
+            return ['id' => empty($pathInfo[2]) ? '' : $pathInfo[2], 'type' => Url::CONTROLLER_SEARCH];
         } elseif ($pathInfo[1] == $this->url->getRoute(Url::CONTROLLER_AUTHOR)
             && !empty($pathInfo[2])
             && ($authorId = $this->_getAuthorId($pathInfo[2]))