iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-06 21:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r27925 from branch 2.6 to trunk

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



git-svn-id: http://piwigo.org/svn/trunk@27926 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2014-03-24 20:22:43 +00:00
parent 6b5940c9e1
commit fa53820760
2 changed files with 161 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/functions_category.inc.php
View File

@@ -538,6 +538,15 @@ FROM '.CATEGORIES_TABLE.' as c
if ( !isset( $cat['id_uppercat'] ) )
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']++;