From d8aafce20dc57e43eed2e469dd60b0ddf3d6a23d Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Thu, 13 Nov 2008 05:54:35 +0000 Subject: #328110 by marcingy, Damien Tournoud, swentel, and pwolanin: Fix error on admin/build/menu, and robustify the test so we catch stuff like this in the future. --- modules/menu/menu.module | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'modules/menu/menu.module') 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']; -- cgit v1.2.3