From 6d93ee696bfde1790dbf0af2a2d08863968a270d Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Tue, 9 Aug 2005 00:37:02 +0000
Subject: - Menu: remove array_merge warning when editing a node without menu
 item.

---
 modules/menu/menu.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/menu/menu.module')

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));
     }
   }
 
-- 
cgit v1.2.3