From b69b8505914b3f8723cce525d8ac28c90e8d34a6 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 10 Apr 2007 12:11:42 +0000
Subject: - Patch #126177 by AjK: fixed E_NOTICE because of sloppy
 array_merge_recursive().

---
 modules/node/node.module | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/node')

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;
   }
-- 
cgit v1.2.3