Merge branch 'master' into variations_and_features

doofinder · Jun 24, 2015 · 5bb53a0 · 5bb53a0
2 parents f92d346 + 52dc4a2
commit 5bb53a0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/dfTools.class.php b/dfTools.class.php
@@ -477,6 +477,8 @@ public static function getCategoryPath($id_category, $id_lang, $id_shop, $full =
     if (isset(self::$cached_category_paths[$id_category]))
       return self::$cached_category_paths[$id_category];
 
+    $excluded_ids = implode(',', self::getRootCategoryIds($id_lang));
+
     $sql = "
       SELECT
         cl.name
@@ -490,14 +492,15 @@ public static function getCategoryPath($id_category, $id_lang, $id_shop, $full =
         AND cl.id_shop = _ID_SHOP_
         AND cl.id_lang = _ID_LANG_
         AND parent.level_depth <> 0
-        AND parent.active = 1
-        AND parent.id_category NOT IN (_EXCLUDED_IDS_)
-      ORDER BY
+        AND parent.active = 1 ";
+
+    if(count($excluded_ids) > 0 && $excludes_ids[0] != "")
+      $sql .= "AND parent.id_category NOT IN (_EXCLUDED_IDS_) ";
+
+    $sql .= "ORDER BY
         parent.nleft
-      ;
-    ";
+      ;";
 
-    $excluded_ids = implode(',', self::getRootCategoryIds($id_lang));
     $sql = self::prepareSQL($sql, array('_ID_CATEGORY_' => $id_category,
                                         '_ID_SHOP_' => $id_shop,
                                         '_ID_LANG_' => $id_lang,

diff --git a/dist/doofinder-p1.5-latest.zip b/dist/doofinder-p1.5-latest.zip
diff --git a/doofinder.php b/doofinder.php
@@ -43,7 +43,7 @@ class Doofinder extends Module
 
   const GS_SHORT_DESCRIPTION = 1;
   const GS_LONG_DESCRIPTION = 2;
-  const VERSION = "1.5.4";
+  const VERSION = "1.5.5";
 
   const YES = 1;
   const NO = 0;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doofinder-for-prestashop",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^0.5.0",