Merge pull request #178 from PrestaShop/dev

Release 2.1.1
PrestaShop · Jun 24, 2022 · a11c76e · a11c76e
2 parents 4feccca + b3ec4b8
commit a11c76e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/_dev/front/js/components/Create/Create.vue b/_dev/front/js/components/Create/Create.vue
@@ -144,7 +144,6 @@
   .wishlist {
     &-create {
       .wishlist-modal {
-        display: block;
         opacity: 0;
         pointer-events: none;
         z-index: 0;

diff --git a/blockwishlist.php b/blockwishlist.php
@@ -72,7 +72,7 @@ public function __construct()
     {
         $this->name = 'blockwishlist';
         $this->tab = 'front_office_features';
-        $this->version = '2.1.0';
+        $this->version = '2.1.1';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
 

diff --git a/config.xml b/config.xml
@@ -2,11 +2,11 @@
 <module>
     <name>blockwishlist</name>
     <displayName><![CDATA[Wishlist block]]></displayName>
-    <version><![CDATA[2.1.0]]></version>
+    <version><![CDATA[2.1.1]]></version>
     <description><![CDATA[Adds a block containing the customer&#039;s wishlists.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>
-    <is_configurable>0</is_configurable>
+    <is_configurable>1</is_configurable>
     <need_instance>0</need_instance>
     <limited_countries></limited_countries>
 </module>
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Search/WishListProductSearchProvider.php b/src/Search/WishListProductSearchProvider.php
@@ -35,6 +35,7 @@
 use Product;
 use Shop;
 use Symfony\Component\Translation\TranslatorInterface;
+use Validate;
 use WishList;
 
 /**
@@ -167,7 +168,10 @@ private function getProductsOrCount(
 
         if ('products' === $type) {
             $sortOrder = $query->getSortOrder()->toLegacyOrderBy(true);
-            $querySearch->orderBy($sortOrder . ' ' . $query->getSortOrder()->toLegacyOrderWay());
+            $sortWay = $query->getSortOrder()->toLegacyOrderWay();
+            if (Validate::isOrderBy($sortOrder) && Validate::isOrderWay($sortWay)) {
+                $querySearch->orderBy($sortOrder . ' ' . $sortWay);
+            }
             $querySearch->limit((int) $query->getResultsPerPage(), ((int) $query->getPage() - 1) * (int) $query->getResultsPerPage());
             $products = $this->db->executeS($querySearch);