Changeset 23075 for branches/2.5

Timestamp:

Jun 6, 2013, 4:02:33 PM (11 years ago)

Author:

plg

Message:

bug 2907 fixed (only on 2.5, rvelices did a deeper rewrite for 2.6): wrong number of sub-albums

File:

• branches/2.5/include/functions_user.inc.php (modified) (2 diffs)

branches/2.5/include/functions_user.inc.php

@@ -405 +405 @@
       if ( !is_admin($userdata['status']) )
       { // for non admins we forbid categories with no image (feature 1053)
+        $uppercats_of = null;
         $forbidden_ids = array();
         foreach ($user_cache_cats as $cat)
@@ -412 +413 @@
             $forbidden_ids[] = $cat['cat_id'];
             unset( $user_cache_cats[$cat['cat_id']] );
+
+            if (empty($uppercats_of))
+            {
+              $query = '
+SELECT
+    id,
+    uppercats
+  FROM '.CATEGORIES_TABLE.'
+;';
+              $uppercats_of = simple_hash_from_query($query, 'id', 'uppercats');
+            }
+
+            // if child album is removed, we must decrease the number of
+            // sub-albums of all parent albums (to the root)
+            if (isset($uppercats_of[$cat['cat_id']]))
+            {
+              foreach (explode(',', $uppercats_of[$cat['cat_id']]) as $id)
+              {
+                // the last $id is the current album removed, it will always
+                // fail the following condition because it was removed a few
+                // lines before.
+                if (isset($user_cache_cats[$id]))
+                {
+                  $user_cache_cats[$id]['count_categories']--;
+                }
+              }
+            }
           }
         }