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
Piwigo · Aug 30, 2011 · 2d52f65 · 2d52f65
1 parent 9983af7
commit 2d52f65
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/admin/site_update.php b/admin/site_update.php
@@ -312,16 +312,16 @@
         '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);
   }