diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-11 16:56:48 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-11 16:56:48 +0000 |
commit | f2ecddea98896f73c64b5b3cee47c6b9f872966a (patch) | |
tree | b2ef81fe3b1932741e2b50ea87d98f1dc5fe9a48 /includes | |
parent | bd108c7f1036858fc2b4293ee2bad0474129fab9 (diff) | |
download | brdo-f2ecddea98896f73c64b5b3cee47c6b9f872966a.tar.gz brdo-f2ecddea98896f73c64b5b3cee47c6b9f872966a.tar.bz2 |
#328110 by Damien Tournoud: Remove recoverable fatal error from menu system.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/menu.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index f4f8ecd29..d80b6dce2 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -1913,6 +1913,7 @@ 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'])) { @@ -2017,7 +2018,6 @@ 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'], $item['options'], $item['customized'], $item['mlid']); + $item['module'], $item['link_title'], serialize($item['options']), $item['customized'], $item['mlid']); // Check the has_children status of the parent. _menu_update_parental_status($item); menu_cache_clear($menu_name); |