Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGETWO-87815

Author: slopukhov

app/code/Magento/Backend/Model/Auth/StorageInterface.php

@@ -23,7 +23,7 @@ interface StorageInterface
     public function processLogin();
 
     /**
-     * Perform login specific actions
+     * Perform logout specific actions
      *
      * @return $this
      * @abstract

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -409,7 +409,7 @@
             <label>Web</label>
             <tab>general</tab>
             <resource>Magento_Config::web</resource>
-            <group id="url" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
+            <group id="url" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Url Options</label>
                 <field id="use_store" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Add Store Code to Urls</label>
@@ -419,7 +419,7 @@
                         <![CDATA[<strong style="color:red">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third party services (e.g. PayPal etc.).]]>
                     </comment>
                 </field>
-                <field id="redirect_to_base" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                <field id="redirect_to_base" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Auto-redirect to Base URL</label>
                     <source_model>Magento\Config\Model\Config\Source\Web\Redirect</source_model>
                     <comment>I.e. redirect from http://example.com/store/ to http://www.example.com/store/</comment>

app/code/Magento/Catalog/Block/Product/ImageBuilder.php

@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Block\Product;
 
 use Magento\Catalog\Helper\ImageFactory as HelperFactory;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Image\NotLoadInfoImageException;
 
 class ImageBuilder
@@ -21,7 +22,7 @@ class ImageBuilder
     protected $helperFactory;
 
     /**
-     * @var \Magento\Catalog\Model\Product
+     * @var Product
      */
     protected $product;
 
@@ -50,10 +51,10 @@ public function __construct(
     /**
      * Set product
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @return $this
      */
-    public function setProduct(\Magento\Catalog\Model\Product $product)
+    public function setProduct(Product $product)
     {
         $this->product = $product;
         return $this;
@@ -79,9 +80,7 @@ public function setImageId($imageId)
      */
     public function setAttributes(array $attributes)
     {
-        if ($attributes) {
-            $this->attributes = $attributes;
-        }
+        $this->attributes = $attributes;
         return $this;
     }
 

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

@@ -152,7 +152,9 @@ protected function _initCategory()
      */
     public function execute()
     {
-        if ($this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED)) {
+        if (!$this->_request->getParam('___from_store')
+            && $this->_request->getParam(self::PARAM_NAME_URL_ENCODED)
+        ) {
             return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl());
         }
         $category = $this->_initCategory();

app/code/Magento/Catalog/Controller/Product/View.php

@@ -76,7 +76,10 @@ public function execute()
         $productId = (int) $this->getRequest()->getParam('id');
         $specifyOptions = $this->getRequest()->getParam('options');
 
-        if ($this->getRequest()->isPost() && $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED)) {
+        if (!$this->_request->getParam('___from_store')
+            && $this->_request->isPost()
+            && $this->_request->getParam(self::PARAM_NAME_URL_ENCODED)
+        ) {
             $product = $this->_initProduct();
             if (!$product) {
                 return $this->noProductRedirect();