diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-08-25 16:41:30 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-08-25 16:41:30 +0000 |
| commit | cdb6aa723baff615182b5e36f240d2ce28dd1ce5 (patch) | |
| tree | f24271827e4272fecd5ca2b82362f12b68aaa9ac | |
| parent | 674e2f493b24f0422a1912cfc4b5ebd68948d728 (diff) | |
| download | brdo-cdb6aa723baff615182b5e36f240d2ce28dd1ce5.tar.gz brdo-cdb6aa723baff615182b5e36f240d2ce28dd1ce5.tar.bz2 | |
- #10342: PHP5 fix with undefined array.
| -rw-r--r-- | modules/node.module | 10 | ||||
| -rw-r--r-- | modules/node/node.module | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/modules/node.module b/modules/node.module index 4c99294b5..3a0a7634b 100644 --- a/modules/node.module +++ b/modules/node.module @@ -1127,6 +1127,7 @@ function node_form($edit) { // Get the node-specific bits. // We can't use node_invoke() because $param must be passed by reference. $function = node_get_module_name($edit) .'_form'; + $param = array(); if (function_exists($function)) { $form .= $function($edit, $param); } @@ -1139,7 +1140,7 @@ function node_form($edit) { // Add hidden 'op' variable, which specifies the default operation (Preview). $output .= '<input type="hidden" name="op" value="'. check_form(t('Preview')) ."\" />\n"; - // Add the admin-specific parts/ + // Add the admin-specific parts. if (user_access('administer nodes')) { $output .= '<div class="admin">'; @@ -1218,7 +1219,12 @@ function node_form($edit) { $extra = node_invoke_nodeapi($edit, 'form param'); foreach ($extra as $key => $value) { if (is_array($value)) { - $param[$key] = array_merge($param[$key], $value); + if (isset($param[$key])) { + $param[$key] = array_merge($param[$key], $value); + } + else { + $param[$key] = $value; + } } else { $param[$key] = $value; diff --git a/modules/node/node.module b/modules/node/node.module index 4c99294b5..3a0a7634b 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1127,6 +1127,7 @@ function node_form($edit) { // Get the node-specific bits. // We can't use node_invoke() because $param must be passed by reference. $function = node_get_module_name($edit) .'_form'; + $param = array(); if (function_exists($function)) { $form .= $function($edit, $param); } @@ -1139,7 +1140,7 @@ function node_form($edit) { // Add hidden 'op' variable, which specifies the default operation (Preview). $output .= '<input type="hidden" name="op" value="'. check_form(t('Preview')) ."\" />\n"; - // Add the admin-specific parts/ + // Add the admin-specific parts. if (user_access('administer nodes')) { $output .= '<div class="admin">'; @@ -1218,7 +1219,12 @@ function node_form($edit) { $extra = node_invoke_nodeapi($edit, 'form param'); foreach ($extra as $key => $value) { if (is_array($value)) { - $param[$key] = array_merge($param[$key], $value); + if (isset($param[$key])) { + $param[$key] = array_merge($param[$key], $value); + } + else { + $param[$key] = $value; + } } else { $param[$key] = $value; |