From fe28759b1eae585227c70c0783185bb5b0b20ec9 Mon Sep 17 00:00:00 2001
From: Nancy Nicoles <jn2@phpexercises.com>
Date: Fri, 17 Jun 2011 13:35:03 -0500
Subject: [PATCH] Issue #597108 by jn2: Changed 'complete_form' form_state key to include underscore for consistency.

---
 includes/form.inc            |   12 ++++++------
 modules/field/field.form.inc |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/includes/form.inc b/includes/form.inc
index 8f2ee26..1934006 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -534,7 +534,7 @@ function form_state_keys_no_cache() {
     'buttons',
     'triggering_element',
     'clicked_button',
-    'complete form',
+    'complete_form',
     'groups',
     'input',
     'method',
@@ -1333,7 +1333,7 @@ function _form_validate(&$elements, &$form_state, $form_id = NULL) {
     // #value data.
     elseif (isset($elements['#element_validate'])) {
       foreach ($elements['#element_validate'] as $function) {
-        $function($elements, $form_state, $form_state['complete form']);
+        $function($elements, $form_state, $form_state['complete_form']);
       }
     }
     $elements['#validated'] = TRUE;
@@ -1693,7 +1693,7 @@ function form_builder($form_id, &$element, &$form_state) {
     // Store a reference to the complete form in $form_state prior to building
     // the form. This allows advanced #process and #after_build callbacks to
     // perform changes elsewhere in the form.
-    $form_state['complete form'] = &$element;
+    $form_state['complete_form'] = &$element;
 
     // Set a flag if we have a correct form submission. This is always TRUE for
     // programmed forms coming from drupal_form_submit(), or if the form_id coming
@@ -1720,7 +1720,7 @@ function form_builder($form_id, &$element, &$form_state) {
   // checkboxes and files.
   if (isset($element['#process']) && !$element['#processed']) {
     foreach ($element['#process'] as $process) {
-      $element = $process($element, $form_state, $form_state['complete form']);
+      $element = $process($element, $form_state, $form_state['complete_form']);
     }
     $element['#processed'] = TRUE;
   }
@@ -3305,7 +3305,7 @@ function form_process_machine_name($element, &$form_state) {
   // complete form in $form_state. By reference, because we need to append
   // a #field_suffix that will hold the live preview.
   $key_exists = NULL;
-  $source = drupal_array_get_nested_value($form_state['complete form'], $element['#machine_name']['source'], $key_exists);
+  $source = drupal_array_get_nested_value($form_state['complete_form'], $element['#machine_name']['source'], $key_exists);
   if (!$key_exists) {
     return $element;
   }
@@ -3317,7 +3317,7 @@ function form_process_machine_name($element, &$form_state) {
   $source['#field_suffix'] .= ' <small id="' . $suffix_id . '">&nbsp;</small>';
 
   $parents = array_merge($element['#machine_name']['source'], array('#field_suffix'));
-  drupal_array_set_nested_value($form_state['complete form'], $parents, $source['#field_suffix']);
+  drupal_array_set_nested_value($form_state['complete_form'], $parents, $source['#field_suffix']);
 
   $element['#machine_name']['suffix'] = '#' . $suffix_id;
 
diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc
index 845f041..8a5b2e0 100644
--- a/modules/field/field.form.inc
+++ b/modules/field/field.form.inc
@@ -339,7 +339,7 @@ function field_default_form_errors($entity_type, $entity, $field, $instance, $la
     $function_exists = function_exists($function);
 
     // Locate the correct element in the the form.
-    $element = drupal_array_get_nested_value($form_state['complete form'], $field_state['array_parents']);
+    $element = drupal_array_get_nested_value($form_state['complete_form'], $field_state['array_parents']);
 
     $multiple_widget = field_behaviors_widget('multiple values', $instance) != FIELD_BEHAVIOR_DEFAULT;
     foreach ($field_state['errors'] as $delta => $delta_errors) {
-- 
1.7.1