aboutsummaryrefslogtreecommitdiffstats
path: root/include/ws_functions/pwg.categories.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2014-01-24 20:12:08 +0000
committerplegall <plg@piwigo.org>2014-01-24 20:12:08 +0000
commit01301c2500fba37c96d5993199ecb0d5196830d0 (patch)
tree5416c7f5d989c467ca8289e1c78fca1757263111 /include/ws_functions/pwg.categories.php
parent0dd928f7985c1169e049b5a5cfede8e31f34022c (diff)
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) git-svn-id: http://piwigo.org/svn/trunk@26953 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/ws_functions/pwg.categories.php')
-rw-r--r--include/ws_functions/pwg.categories.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ws_functions/pwg.categories.php b/include/ws_functions/pwg.categories.php
index d77b88580..47dbc4735 100644
--- a/include/ws_functions/pwg.categories.php
+++ b/include/ws_functions/pwg.categories.php
@@ -459,7 +459,7 @@ SELECT id, path, representative_ext
if ($params['tree_output'])
{
- $cats = categories_flatlist_to_tree($cats);
+ return categories_flatlist_to_tree($cats);
}
return array(