Changeset 12012


Ignore:
Timestamp:
Aug 30, 2011, 11:25:56 AM (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/site_update.php

    r11728 r12012  
    313313        );
    314314      mass_inserts(CATEGORIES_TABLE, $dbfields, $inserts);
    315     }
    316 
    317     // add default permissions to categories
    318     $category_ids = array();
    319     foreach ($inserts as $category)
    320     {
    321       $category_ids[] = $category['id'];
    322     }
    323     add_permission_on_category($category_ids, get_admins());
    324 
     315     
     316      // add default permissions to categories
     317      $category_ids = array();
     318      foreach ($inserts as $category)
     319      {
     320        $category_ids[] = $category['id'];
     321      }
     322      add_permission_on_category($category_ids, get_admins());
     323    }
     324   
    325325    $counts['new_categories'] = count($inserts);
    326326  }
Note: See TracChangeset for help on using the changeset viewer.