diff options
| -rw-r--r-- | modules/menu.module | 2 | ||||
| -rw-r--r-- | modules/menu/menu.module | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/menu.module b/modules/menu.module index 729864a70..1f86a8d80 100644 --- a/modules/menu.module +++ b/modules/menu.module @@ -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)); } } diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 729864a70..1f86a8d80 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -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)); } } |