From 2210b607b063f5aa748190add99b85e4628da6cf Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 29 Jan 2006 07:46:57 +0000 Subject: - Patch #46705 by killes: don't use array_merge. --- modules/node.module | 2 +- modules/node/node.module | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/node.module b/modules/node.module index 7d533fb9d..5dddec218 100644 --- a/modules/node.module +++ b/modules/node.module @@ -1628,7 +1628,7 @@ function node_form_array($node) { $form['#node'] = $node; // Get the node-specific bits. - $form = array_merge($form, node_invoke($node, 'form')); + $form = array_merge_recursive($form, node_invoke($node, 'form')); if (!isset($form['title']['#weight'])) { $form['title']['#weight'] = -5; } diff --git a/modules/node/node.module b/modules/node/node.module index 7d533fb9d..5dddec218 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1628,7 +1628,7 @@ function node_form_array($node) { $form['#node'] = $node; // Get the node-specific bits. - $form = array_merge($form, node_invoke($node, 'form')); + $form = array_merge_recursive($form, node_invoke($node, 'form')); if (!isset($form['title']['#weight'])) { $form['title']['#weight'] = -5; } -- cgit v1.2.3