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

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));
     }
   }
 

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));
     }
   }