diff options
| author | Dries Buytaert <dries@buytaert.net> | 2007-04-10 12:11:42 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2007-04-10 12:11:42 +0000 |
| commit | b69b8505914b3f8723cce525d8ac28c90e8d34a6 (patch) | |
| tree | 5ad833f4e2b9e27267c18d45aba14614dff52fc2 /modules/node/node.module | |
| parent | cbca44a8a740bb606505c6eb59491a06f8f33f6e (diff) | |
| download | brdo-b69b8505914b3f8723cce525d8ac28c90e8d34a6.tar.gz brdo-b69b8505914b3f8723cce525d8ac28c90e8d34a6.tar.bz2 | |
- Patch #126177 by AjK: fixed E_NOTICE because of sloppy array_merge_recursive().
Diffstat (limited to 'modules/node/node.module')
| -rw-r--r-- | modules/node/node.module | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/node/node.module b/modules/node/node.module index 978aceece..68e56f3af 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -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; } |