diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-01-29 07:46:57 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-01-29 07:46:57 +0000 |
| commit | 2210b607b063f5aa748190add99b85e4628da6cf (patch) | |
| tree | b9dc3ba8c2a2d6500cd70c837c9ae1464caf86d8 | |
| parent | 5c75ee8947ce076ae2b9610e77969ceae7a91bac (diff) | |
| download | brdo-2210b607b063f5aa748190add99b85e4628da6cf.tar.gz brdo-2210b607b063f5aa748190add99b85e4628da6cf.tar.bz2 | |
- Patch #46705 by killes: don't use array_merge.
| -rw-r--r-- | modules/node.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 |
2 files changed, 2 insertions, 2 deletions
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; } |