Commit b69b8505 authored by Dries's avatar Dries
Browse files

- Patch #126177 by AjK: fixed E_NOTICE because of sloppy array_merge_recursive().

parent cbca44a8
......@@ -2020,7 +2020,9 @@ function node_form($node, $form_values = NULL) {
$node->format = NULL;
}
// Get the node-specific bits.
$form = array_merge_recursive($form, node_invoke($node, 'form', $form_values));
if ($extra = node_invoke($node, 'form', $form_values)) {
$form = array_merge_recursive($form, $extra);
}
if (!isset($form['title']['#weight'])) {
$form['title']['#weight'] = -5;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment