Changeset 12012

Timestamp:

Aug 30, 2011, 11:25:56 AM (13 years ago)

Author:

plg

Message:

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.

File:

• trunk/admin/site_update.php (modified) (1 diff)

trunk/admin/site_update.php

@@ -313 +313 @@
         );
       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);
   }