Merge remote-tracking branch 'origin/MAGETWO-39604' into BugFestW2

Author: Maksym Aposov

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

@@ -296,7 +296,7 @@ public function prepareSortableFieldsByCategory($category)
         }
         $availableOrders = $this->getAvailableOrders();
         if (!$this->getSortBy()) {
-            $categorySortBy = $category->getDefaultSortBy();
+            $categorySortBy = $this->getDefaultSortBy() ?: $category->getDefaultSortBy();
             if ($categorySortBy) {
                 if (!$availableOrders) {
                     $availableOrders = $this->_getConfig()->getAttributeUsedForSortByArray();

app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php

@@ -355,7 +355,7 @@ public function removeOrderFromAvailableOrders($order)
     }
 
     /**
-     * Compare defined order field vith current order field
+     * Compare defined order field with current order field
      *
      * @param string $order
      * @return bool
@@ -375,7 +375,7 @@ public function getPagerUrl($params = [])
     {
         $urlParams = [];
         $urlParams['_current'] = true;
-        $urlParams['_escape'] = true;
+        $urlParams['_escape'] = false;
         $urlParams['_use_rewrite'] = true;
         $urlParams['_query'] = $params;
         return $this->getUrl('*/*/*', $urlParams);

app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js

@@ -68,7 +68,9 @@ define([
                 parameters;
             for (var i = 0; i < urlParams.length; i++) {
                 parameters = urlParams[i].split('=');
-                paramData[parameters[0]] = parameters[1] !== undefined ? parameters[1] : '';
+                paramData[parameters[0]] = parameters[1] !== undefined
+                    ? window.decodeURIComponent(parameters[1].replace(/\+/g, '%20'))
+                    : '';
             }
             paramData[paramName] = paramValue;
             if (paramValue == defaultValue) {
@@ -81,4 +83,4 @@ define([
     });
 
     return $.mage.productListToolbarForm;
-});
+});

app/code/Magento/CatalogSearch/Block/Result.php

@@ -133,12 +133,13 @@ public function setListOrders()
         /* @var $category \Magento\Catalog\Model\Category */
         $availableOrders = $category->getAvailableSortByOptions();
         unset($availableOrders['position']);
+        $availableOrders['relevance'] = __('Relevance');
 
         $this->getListBlock()->setAvailableOrders(
             $availableOrders
         )->setDefaultDirection(
             'desc'
-        )->setSortBy(
+        )->setDefaultSortBy(
             'relevance'
         );