MAGETWO-91608: SEO-friendly URL for category page not working

Author: danielrenaud

app/code/Magento/Catalog/Controller/Adminhtml/Category.php

@@ -38,19 +38,6 @@ public function __construct(
         parent::__construct($context);
     }
 
-    /**
-     * Resolve store id
-     *
-     * Tries to take store id from store HTTP parameter
-     * @see Store
-     *
-     * @return int
-     */
-    private function resolveStoreId() : int
-    {
-        return (int) $this->getRequest()->getParam('store', Store::DEFAULT_STORE_ID);
-    }
-
     /**
      * Initialize requested category and put it into registry.
      * Root category can be returned, if inappropriate store/category is specified
@@ -87,7 +74,7 @@ protected function _initCategory($getRootInstead = false)
         $this->_objectManager->get(\Magento\Framework\Registry::class)->register('category', $category);
         $this->_objectManager->get(\Magento\Framework\Registry::class)->register('current_category', $category);
         $this->_objectManager->get(\Magento\Cms\Model\Wysiwyg\Config::class)
-            ->setStoreId($this->getRequest()->getParam('store'));
+            ->setStoreId($storeId);
         return $category;
     }
 
@@ -96,13 +83,28 @@ protected function _initCategory($getRootInstead = false)
      *
      * @return int
      */
-    private function resolveCategoryId()
+    private function resolveCategoryId() : int
     {
         $categoryId = (int)$this->getRequest()->getParam('id', false);
 
         return $categoryId ?: (int)$this->getRequest()->getParam('entity_id', false);
     }
 
+    /**
+     * Resolve store id
+     *
+     * Tries to take store id from store HTTP parameter
+     * @see Store
+     *
+     * @return int
+     */
+    private function resolveStoreId() : int
+    {
+        $storeId = (int)$this->getRequest()->getParam('store', false);
+
+        return $storeId ?: (int)$this->getRequest()->getParam('store_id', Store::DEFAULT_STORE_ID);
+    }
+
     /**
      * Build response for ajax request
      *