Merge pull request #235 from oc-shopaholic/develop

Release version 1.24.1
oc-shopaholic · Dec 24, 2019 · 0d3711c · 0d3711c
2 parents 6422e21 + c470058
commit 0d3711c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/classes/item/CategoryItem.php b/classes/item/CategoryItem.php
@@ -151,12 +151,21 @@ public function getPageParamList($sPageCode, $arRemoveParamList = []) : array
             $arSlugList = array_reverse($arSlugList);
             $arResult[array_shift($arWildcardParamList)] = implode('/', $arSlugList);
 
+            return $arResult;
+        } elseif (count($arParamList) == 1) {
+            $sParamName = array_shift($arParamList);
+            $arResult[$sParamName] = array_shift($arSlugList);
+
             return $arResult;
         }
 
         //Prepare page property list
+        $arSlugList = array_reverse($arSlugList);
+        $arParamList = array_reverse($arParamList);
         foreach ($arParamList as $sParamName) {
-            $arResult[$sParamName] = array_shift($arSlugList);
+            if (!empty($arSlugList)) {
+                $arResult[$sParamName] = array_shift($arSlugList);
+            }
         }
 
         return $arResult;

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -107,4 +107,6 @@
 1.23.1:
     - 'Added step attribute to offer price field in backend view'
 1.24.0:
-    - 'Added support of wildcard params to CategoryPage component. Requires Toolbox plugin version 1.26.0 and later'
+    - 'Added support of wildcard params to CategoryPage component. Requires Toolbox plugin version 1.26.0 and later'
+1.24.1:
+    - 'Fixed support of wildcard params in CategoryPage component. Requires Toolbox plugin version 1.26.1 and later'