Changeset 26953 for trunk

Timestamp:

Jan 24, 2014, 9:12:08 PM (11 years ago)

Author:

plg

Message:

merge r26952 from branch 2.6 to trunk

bug 3035 fixed: the output of pwg.categories.getList with option
tree_output=true was modified in r22729 to fix a bug. But fixing this bug has
broken iOS/Android applications which uses this parameter. The immediate
solution is to reintroduce the bug for now and fix it cleanly later (requires
a new version of iOS/Android apps)

File:

• trunk/include/ws_functions/pwg.categories.php (modified) (1 diff)

trunk/include/ws_functions/pwg.categories.php

@@ -460 +460 @@
   if ($params['tree_output'])
   {
-    $cats = categories_flatlist_to_tree($cats);
+    return categories_flatlist_to_tree($cats);
   }