From 4db70f8a62be5fe8efa4f04216941e7eff7f3db2 Mon Sep 17 00:00:00 2001
From: Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>
Date: Sun, 26 Mar 2006 17:41:06 +0000
Subject: somehow escaped committing, belongs to #28625

---
 includes/form.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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')) {
-- 
cgit v1.2.3