- Patch #46705 by killes: don't use array_merge.

4.7.x
Dries Buytaert 2006-01-29 07:46:57 +00:00
parent 5c75ee8947
commit 2210b607b0
2 changed files with 2 additions and 2 deletions

View File

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

View File

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