diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-11 18:15:01 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-11 18:15:01 +0000 |
| commit | 5d85d16a752a640016601f36fc51a80e2c56c6ca (patch) | |
| tree | fd5a88544ca93829c2f38b9e1f4da4e7fef051e9 | |
| parent | f2ecddea98896f73c64b5b3cee47c6b9f872966a (diff) | |
| download | brdo-5d85d16a752a640016601f36fc51a80e2c56c6ca.tar.gz brdo-5d85d16a752a640016601f36fc51a80e2c56c6ca.tar.bz2 | |
Oops. Roll-back of #328110. Apologies
| -rw-r--r-- | includes/menu.inc | 4 | ||||
| -rw-r--r-- | modules/menu/menu.module | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index d80b6dce2..f4f8ecd29 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -1913,7 +1913,6 @@ function menu_link_save(&$item) { $existing_item = FALSE; if (isset($item['mlid'])) { $existing_item = db_fetch_array(db_query("SELECT * FROM {menu_links} WHERE mlid = %d", $item['mlid'])); - $existing_item['options'] = unserialize($existing_item['options']); } if (isset($item['plid'])) { @@ -2018,6 +2017,7 @@ function menu_link_save(&$item) { $item['router_path'] = _menu_find_router_path($menu, $item['link_path']); } } + $item['options'] = serialize($item['options']); // If every value in $existing_item is the same in the $item, there is no // reason to run the update queries or clear the caches. We use // array_diff_assoc() with the $existing_item as the first parameter @@ -2033,7 +2033,7 @@ function menu_link_save(&$item) { $item['router_path'], $item['hidden'], $item['external'], $item['has_children'], $item['expanded'], $item['weight'], $item['depth'], $item['p1'], $item['p2'], $item['p3'], $item['p4'], $item['p5'], $item['p6'], $item['p7'], $item['p8'], $item['p9'], - $item['module'], $item['link_title'], serialize($item['options']), $item['customized'], $item['mlid']); + $item['module'], $item['link_title'], $item['options'], $item['customized'], $item['mlid']); // Check the has_children status of the parent. _menu_update_parental_status($item); menu_cache_clear($menu_name); diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 656a87a8a..cc2fcb69c 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -154,13 +154,11 @@ function menu_theme() { */ function menu_enable() { menu_rebuild(); - $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'; + $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'; $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']; |