Changeset 27926 for trunk/include

Timestamp:

Mar 24, 2014, 9:22:43 PM (10 years ago)

Author:

plg

Message:

merge r27925 from branch 2.6 to trunk

bug 3057: avoid warnings and SQL crash when encountering inconsistent
permissions + rewrite permissions consistancy check when setting albums
to private status.

File:

• trunk/include/functions_category.inc.php (modified) (1 diff)

trunk/include/functions_category.inc.php

@@ -539 +539 @@
       continue;
 
+    // Piwigo before 2.5.3 may have generated inconsistent permissions, ie
+    // private album A1/A2 permitted to user U1 but private album A1 not
+    // permitted to U1.
+    // 
+    // TODO 2.7: add an upgrade script to repair permissions and remove this
+    // test
+    if ( !isset($cats[ $cat['id_uppercat'] ]))
+      continue;
+
     $parent = & $cats[ $cat['id_uppercat'] ];
     $parent['nb_categories']++;