- Patch #41023 by wtanaka: custom form elements can't cleanly set a value for themselves.

1 files changed, 7 insertions, 2 deletions

diff --git a/includes/form.inc b/includes/form.inc
index 300b78267..0f5ce2961 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -279,8 +279,6 @@ function _form_builder($form_id, $form) {
         $form_submitted = $form_submitted || $form['#form_submitted'];
       }
     }
-
-    $ref = $form['#value'];
   }
 
   // Allow for elements to expand to multiple elements. Radios, checkboxes and files for instance.
@@ -294,6 +292,13 @@ function _form_builder($form_id, $form) {
     $form['#processed'] = TRUE;
   }
 
+  // Set the $form_values key that gets passed to validate and submit.
+  // We call this after #process gets called so that #process has a
+  // chance to update #value if desired.
+  if ($form['#input']) {
+    $ref = $form['#value'];
+  }
+
   // Recurse through all child elements.
   $count  = 0;
   foreach (element_children($form) as $key) {