diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-08-09 00:37:02 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2005-08-09 00:37:02 +0000 |
| commit | 6d93ee696bfde1790dbf0af2a2d08863968a270d (patch) | |
| tree | 198a73455497d71774916639198f072eb5606bd3 /modules/menu.module | |
| parent | c38da7886b2bd8bc6d92996b8d6003fb0285681d (diff) | |
| download | brdo-6d93ee696bfde1790dbf0af2a2d08863968a270d.tar.gz brdo-6d93ee696bfde1790dbf0af2a2d08863968a270d.tar.bz2 | |
- Menu: remove array_merge warning when editing a node without menu item.
Diffstat (limited to 'modules/menu.module')
| -rw-r--r-- | modules/menu.module | 2 |
1 files changed, 1 insertions, 1 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)); } } |