From 2d52f65ce39407a16ba5b0c3c99c7e89fc2ad6f5 Mon Sep 17 00:00:00 2001 From: plegall Date: Tue, 30 Aug 2011 09:25:56 +0000 Subject: merge r12011 from branch 2.2 to trunk bug 2378 fixed: remove MySQL warning when synchronizing with simulation activated. The warning occurs when there are new dircetories found. git-svn-id: http://piwigo.org/svn/trunk@12012 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/site_update.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'admin/site_update.php') diff --git a/admin/site_update.php b/admin/site_update.php index 3a530dd6e..e3201104f 100644 --- a/admin/site_update.php +++ b/admin/site_update.php @@ -312,16 +312,16 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank 'visible','status','rank','global_rank' ); mass_inserts(CATEGORIES_TABLE, $dbfields, $inserts); + + // add default permissions to categories + $category_ids = array(); + foreach ($inserts as $category) + { + $category_ids[] = $category['id']; + } + add_permission_on_category($category_ids, get_admins()); } - - // add default permissions to categories - $category_ids = array(); - foreach ($inserts as $category) - { - $category_ids[] = $category['id']; - } - add_permission_on_category($category_ids, get_admins()); - + $counts['new_categories'] = count($inserts); } -- cgit v1.2.3