Skip to content

GitLab

D
drupal
Commit 6d93ee69 authored by Steven Wittens's avatar Steven Wittens
Browse files
Options

- Menu: remove array_merge warning when editing a node without menu item.

parent c38da788
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/menu.module
View file @ 6d93ee69
......@@ -544,7 +544,7 @@ function menu_node_form($edit = array()) {
if ($edit['nid'] > 0) {
$item = db_fetch_array(db_query("SELECT * FROM {menu} WHERE path = 'node/%d'", $edit['nid']));
if (is_array($edit['menu'])) {
$item = ($_POST['op'] == t('Preview')) ? array_merge($item, $edit['menu']) : array_merge($edit['menu'], $item);
$item = !is_array($item) ? $edit['menu'] : (($_POST['op'] == t('Preview')) ? array_merge($item, $edit['menu']) : array_merge($edit['menu'], $item));
}
}
......
modules/menu/menu.module
View file @ 6d93ee69
......@@ -544,7 +544,7 @@ function menu_node_form($edit = array()) {
if ($edit['nid'] > 0) {
$item = db_fetch_array(db_query("SELECT * FROM {menu} WHERE path = 'node/%d'", $edit['nid']));
if (is_array($edit['menu'])) {
$item = ($_POST['op'] == t('Preview')) ? array_merge($item, $edit['menu']) : array_merge($edit['menu'], $item);
$item = !is_array($item) ? $edit['menu'] : (($_POST['op'] == t('Preview')) ? array_merge($item, $edit['menu']) : array_merge($edit['menu'], $item));
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment