diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/menu/menu.module | 8 | ||||
| -rw-r--r-- | modules/menu/menu.test | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/modules/menu/menu.module b/modules/menu/menu.module index cc2fcb69c..656a87a8a 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -154,11 +154,13 @@ function menu_theme() { */ function menu_enable() { menu_rebuild(); - $link = db_fetch_array(db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/build/menu' AND module = 'system'")); - $link['router_path'] = 'admin/build/menu-customize/%'; - $link['module'] = 'menu'; + $base_link = db_fetch_array(db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/build/menu' AND module = 'system'")); + $base_link['router_path'] = 'admin/build/menu-customize/%'; + $base_link['module'] = 'menu'; $result = db_query("SELECT * FROM {menu_custom}"); while ($menu = db_fetch_array($result)) { + // $link is passed by reference to menu_link_save(), so we make a copy of $base_link. + $link = $base_link; $link['mlid'] = 0; $link['link_title'] = $menu['title']; $link['link_path'] = 'admin/build/menu-customize/' . $menu['menu_name']; diff --git a/modules/menu/menu.test b/modules/menu/menu.test index ac8bdcbef..68d79964e 100644 --- a/modules/menu/menu.test +++ b/modules/menu/menu.test @@ -24,7 +24,7 @@ class MenuTestCase extends DrupalWebTestCase { function setUp() { parent::setUp('menu'); // Create users. - $this->big_user = $this->drupalCreateUser(array('administer blocks', 'administer menu', 'create article content')); + $this->big_user = $this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content')); $this->std_user = $this->drupalCreateUser(array()); } |