aboutsummaryrefslogtreecommitdiffstats
path: root/admin/site_update.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-08-30 09:25:56 +0000
committerplegall <plg@piwigo.org>2011-08-30 09:25:56 +0000
commit2d52f65ce39407a16ba5b0c3c99c7e89fc2ad6f5 (patch)
treee40de4086902d14d4790d4d9364aa58587eb7f7b /admin/site_update.php
parent9983af733615bfc359174f19d82ce7851247c0cd (diff)
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
Diffstat (limited to '')
-rw-r--r--admin/site_update.php18
1 files changed, 9 insertions, 9 deletions
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);
}