From 01301c2500fba37c96d5993199ecb0d5196830d0 Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 24 Jan 2014 20:12:08 +0000 Subject: 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 --- include/ws_functions/pwg.categories.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') 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( -- cgit v1.2.3