diff options
| author | plegall <plg@piwigo.org> | 2011-11-04 21:27:18 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2011-11-04 21:27:18 +0000 |
| commit | ee79c8516a31978e72be5aaa4cdb999ddc960871 (patch) | |
| tree | b1a376baea64416eb9b6f9bc24b9434abfe9b944 /include | |
| parent | 7b1964c51108b32e042329cd204988fee9801dbc (diff) | |
merge r12539 from branch 2.3 to trunk
feature 2352: a bug had been introduced by r12537, the piwigo_user_cache_categories.count_categories
was missing (the list of albums was not refreshing correctly on the upload form)
git-svn-id: http://piwigo.org/svn/trunk@12544 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
| -rw-r--r-- | include/ws_functions.inc.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index ed1f2f3b9..1ebb7502a 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -490,7 +490,7 @@ function ws_categories_getList($params, &$service) SELECT id, name, permalink, uppercats, global_rank, id_uppercat, comment, nb_images, count_images AS total_nb_images, - user_representative_picture_id, count_images, + user_representative_picture_id, count_images, count_categories, date_last, max_date_last, count_categories AS nb_categories FROM '.CATEGORIES_TABLE.' '.$join_type.' JOIN '.USER_CACHE_CATEGORIES_TABLE.' ON id=cat_id AND user_id='.$join_user.' @@ -723,6 +723,7 @@ SELECT id, path, tn_ext // we don't want them in the output unset($cat['user_representative_picture_id']); unset($cat['count_images']); + unset($cat['count_categories']); } unset($cat); // management of the album thumbnail -- stops here |