Changeset 12544 for trunk/include

Timestamp:

Nov 4, 2011, 10:27:18 PM (12 years ago)

Author:

plg

Message:

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)

File:

• trunk/include/ws_functions.inc.php (modified) (2 diffs)

trunk/include/ws_functions.inc.php

@@ -491 +491 @@
     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.'
@@ -724 +724 @@
     unset($cat['user_representative_picture_id']);
     unset($cat['count_images']);
+    unset($cat['count_categories']);
   }
   unset($cat);