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
This commit is contained in:
plegall 2014-01-24 20:12:08 +00:00
parent 0dd928f798
commit 01301c2500

View file

@ -459,7 +459,7 @@ SELECT id, path, representative_ext
if ($params['tree_output']) if ($params['tree_output'])
{ {
$cats = categories_flatlist_to_tree($cats); return categories_flatlist_to_tree($cats);
} }
return array( return array(