Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1338282 by Damien Tournoud, zymsys, JamesOakley, pillarsdotnet, chx: Fixed php notice in menu_link_save().

merge-requests/26/head
webchick 2012-03-26 21:48:45 -07:00
parent 4fb8e143a3
commit c46186fb69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/menu.inc
View File

@ -3141,10 +3141,10 @@ function menu_link_save(&$item, $existing_item = array(), $parent_candidates = a
} }
// If every value in $existing_item is the same in the $item, there is no // 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 // reason to run the update queries or clear the caches. We use
// array_intersect_assoc() with the $item as the first parameter because // array_intersect_key() with the $item as the first parameter because
// $item may have additional keys left over from building a router entry. // $item may have additional keys left over from building a router entry.
// The intersect removes the extra keys, allowing a meaningful comparison. // The intersect removes the extra keys, allowing a meaningful comparison.
if (!$existing_item || (array_intersect_assoc($item, $existing_item)) != $existing_item) { if (!$existing_item || (array_intersect_key($item, $existing_item)) != $existing_item) {
db_update('menu_links') db_update('menu_links')
->fields(array( ->fields(array(
'menu_name' => $item['menu_name'], 'menu_name' => $item['menu_name'],