summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-03-26 17:41:06 +0000
committerGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-03-26 17:41:06 +0000
commit4db70f8a62be5fe8efa4f04216941e7eff7f3db2 (patch)
treef055df5b6eb3f9b58da16fa9f95a0243bf8803ce /includes
parent3c795c554f9ada0df9518b5bdad3de02e25b2a61 (diff)
downloadbrdo-4db70f8a62be5fe8efa4f04216941e7eff7f3db2.tar.gz
brdo-4db70f8a62be5fe8efa4f04216941e7eff7f3db2.tar.bz2
somehow escaped committing, belongs to #28625
Diffstat (limited to 'includes')
-rw-r--r--includes/form.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/form.inc b/includes/form.inc
index d6da7932c..03b35dfa4 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -84,7 +84,7 @@ function drupal_get_form($form_id, &$form, $callback = NULL) {
$form['#id'] = $form_id;
}
- $form = array_merge(_element_info('form'), $form);
+ $form += _element_info('form');
if (!isset($form['#validate'])) {
if (function_exists($form_id .'_validate')) {