From b46e90ad366c57095183891de56894d6a449bc14 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 14 Mar 2009 20:13:27 +0000
Subject: - Patch #322344 by merlinofchaos, Frando, catch, sun: form
 improvements from Views.

---
 modules/book/book.admin.inc         |  2 +-
 modules/book/book.pages.inc         |  1 -
 modules/comment/comment.admin.inc   |  2 +-
 modules/menu/menu.admin.inc         |  2 +-
 modules/node/node.module            |  6 +++---
 modules/openid/openid.module        |  2 +-
 modules/openid/openid.pages.inc     |  4 ++--
 modules/simpletest/tests/form.test  | 12 +++++++-----
 modules/taxonomy/taxonomy.admin.inc | 10 +++++-----
 modules/upload/upload.module        |  4 +---
 modules/user/user.module            |  2 +-
 11 files changed, 23 insertions(+), 24 deletions(-)

(limited to 'modules')

diff --git a/modules/book/book.admin.inc b/modules/book/book.admin.inc
index 34967323f..00c812923 100644
--- a/modules/book/book.admin.inc
+++ b/modules/book/book.admin.inc
@@ -114,7 +114,7 @@ function book_admin_edit_validate($form, &$form_state) {
 function book_admin_edit_submit($form, &$form_state) {
   // Save elements in the same order as defined in post rather than the form.
   // This ensures parents are updated before their children, preventing orphans.
-  $order = array_flip(array_keys($form['#post']['table']));
+  $order = array_flip(array_keys($form_state['input']['table']));
   $form['table'] = array_merge($order, $form['table']);
 
   foreach (element_children($form['table']) as $key) {
diff --git a/modules/book/book.pages.inc b/modules/book/book.pages.inc
index a6139279a..cc61821ad 100644
--- a/modules/book/book.pages.inc
+++ b/modules/book/book.pages.inc
@@ -246,7 +246,6 @@ function book_form_update() {
       form_set_cache($_POST['form_build_id'], $form, $cached_form_state);
       // Build and render the new select element, then return it in JSON format.
       $form_state = array();
-      $form['#post'] = array();
       $form = form_builder($form['form_id']['#value'] , $form, $form_state);
       $output = drupal_render($form['book']['plid']);
       drupal_json(array('status' => TRUE, 'data' => $output));
diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc
index d669fe5e7..a3cbe494d 100644
--- a/modules/comment/comment.admin.inc
+++ b/modules/comment/comment.admin.inc
@@ -163,7 +163,7 @@ function comment_admin_overview_submit($form, &$form_state) {
  * @see comment_multiple_delete_confirm_submit()
  */
 function comment_multiple_delete_confirm(&$form_state) {
-  $edit = $form_state['post'];
+  $edit = $form_state['input'];
 
   $form['comments'] = array(
     '#prefix' => '<ul>',
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index d793c88f7..d55a41269 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -132,7 +132,7 @@ function menu_overview_form_submit($form, &$form_state) {
   // parent. To prevent this, save items in the form in the same order they
   // are sent by $_POST, ensuring parents are saved first, then their children.
   // See http://drupal.org/node/181126#comment-632270
-  $order = array_flip(array_keys($form['#post'])); // Get the $_POST order.
+  $order = array_flip(array_keys($form_state['input'])); // Get the $_POST order.
   $form = array_merge($order, $form); // Update our original form with the new order.
 
   $updated_items = array();
diff --git a/modules/node/node.module b/modules/node/node.module
index 7cdcdea0c..a83cfbdc5 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -293,7 +293,7 @@ function node_mark($nid, $timestamp) {
  * See if the user used JS to submit a teaser.
  */
 function node_teaser_js(&$form, &$form_state) {
-  if (isset($form['#post']['teaser_js'])) {
+  if (isset($form_state['input']['teaser_js'])) {
     // Glue the teaser to the body.
     if (trim($form_state['values']['teaser_js'])) {
       // Space the teaser from the body
@@ -330,8 +330,8 @@ function node_teaser_js(&$form, &$form_state) {
 function node_teaser_include_verify(&$form, &$form_state) {
   $message = '';
 
-  // $form['#post'] is set only when the form is built for preview/submit.
-  if (isset($form['#post']['body']) && isset($form_state['values']['teaser_include']) && !$form_state['values']['teaser_include']) {
+  // $form_state['input'] is set only when the form is built for preview/submit.
+  if (isset($form_state['input']['body']) && isset($form_state['values']['teaser_include']) && !$form_state['values']['teaser_include']) {
     // "teaser_include" checkbox is present and unchecked.
     if (strpos($form_state['values']['body'], '<!--break-->') === 0) {
       // Teaser is empty string.
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index 094c84a20..f9f54faf2 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -87,7 +87,7 @@ function openid_form_user_login_alter(&$form, &$form_state) {
 function _openid_user_login_form_alter(&$form, &$form_state) {
   drupal_add_css(drupal_get_path('module', 'openid') . '/openid.css');
   drupal_add_js(drupal_get_path('module', 'openid') . '/openid.js');
-  if (!empty($form_state['post']['openid_identifier'])) {
+  if (!empty($form_state['input']['openid_identifier'])) {
     $form['name']['#required'] = FALSE;
     $form['pass']['#required'] = FALSE;
     unset($form['#submit']);
diff --git a/modules/openid/openid.pages.inc b/modules/openid/openid.pages.inc
index 9c8a14b59..06a5edfdb 100644
--- a/modules/openid/openid.pages.inc
+++ b/modules/openid/openid.pages.inc
@@ -88,10 +88,10 @@ function openid_user_delete_form($form_state, $account, $aid = 0) {
 }
 
 function openid_user_delete_form_submit(&$form_state, $form_values) {
-  db_query("DELETE FROM {authmap} WHERE uid = %d AND aid = %d AND module = 'openid'", $form_state['#parameters'][2]->uid, $form_state['#parameters'][3]);
+  db_query("DELETE FROM {authmap} WHERE uid = %d AND aid = %d AND module = 'openid'", $form_state['#args'][0]->uid, $form_state['#args'][1]);
   if (db_affected_rows()) {
     drupal_set_message(t('OpenID deleted.'));
   }
-  $form_state['#redirect'] = 'user/'. $form_state['#parameters'][2]->uid .'/openid';
+  $form_state['#redirect'] = 'user/'. $form_state['#args'][0]->uid .'/openid';
 }
 
diff --git a/modules/simpletest/tests/form.test b/modules/simpletest/tests/form.test
index 8d376bfb7..b51c116d0 100644
--- a/modules/simpletest/tests/form.test
+++ b/modules/simpletest/tests/form.test
@@ -60,8 +60,9 @@ class FormsTestCase extends DrupalWebTestCase {
         $element = $data['element']['#title'];
         $form[$element] = $data['element'];
         $form_state['values'][$element] = $empty;
-        $form['#post'] = $form_state['values'];
-        $form['#post']['form_id'] = $form_id;
+        $form_state['input'] = $form_state['values'];
+        $form_state['input']['form_id'] = $form_id;
+        $form_state['method'] = 'post';
         drupal_prepare_form($form_id, $form, $form_state);
         drupal_process_form($form_id, $form, $form_state);
         $errors = form_get_errors();
@@ -288,13 +289,14 @@ class FormsElementsTableSelectFunctionalTest extends DrupalWebTestCase {
   private function formSubmitHelper($form_element, $edit) {
     $form_id = $this->randomName();
 
-    $form = $form_state = array();
+    $form_state = form_state_defaults();
+    $form = array();
 
     $form = array_merge($form, $form_element);
     $form['op'] = array('#type' => 'submit', '#value' => t('Submit'));
 
-    $form['#post'] = $edit;
-    $form['#post']['form_id'] = $form_id;
+    $form_state['input'] = $edit;
+    $form_state['input']['form_id'] = $form_id;
 
     drupal_prepare_form($form_id, $form, $form_state);
 
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index f809529c9..eb580c4d2 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -344,13 +344,13 @@ function taxonomy_overview_terms(&$form_state, $vocabulary) {
 
   // If this form was already submitted once, it's probably hit a validation
   // error. Ensure the form is rebuilt in the same order as the user submitted.
-  if (!empty($form_state['post'])) {
-    $order = array_flip(array_keys($form_state['post'])); // Get the $_POST order.
+  if (!empty($form_state['input'])) {
+    $order = array_flip(array_keys($form_state['input'])); // Get the $_POST order.
     $current_page = array_merge($order, $current_page); // Update our form with the new order.
     foreach ($current_page as $key => $term) {
       // Verify this is a term for the current page and set at the current depth.
-      if (is_array($form_state['post'][$key]) && is_numeric($form_state['post'][$key]['tid'])) {
-        $current_page[$key]->depth = $form_state['post'][$key]['depth'];
+      if (is_array($form_state['input'][$key]) && is_numeric($form_state['input'][$key]['tid'])) {
+        $current_page[$key]->depth = $form_state['input'][$key]['depth'];
       }
       else {
         unset($current_page[$key]);
@@ -440,7 +440,7 @@ function taxonomy_overview_terms_submit($form, &$form_state) {
     return;
   }
 
-  $order = array_flip(array_keys($form['#post'])); // Get the $_POST order.
+  $order = array_flip(array_keys($form_state['input'])); // Get the $_POST order.
   $form_state['values'] = array_merge($order, $form_state['values']); // Update our original form with the new order.
 
   $vocabulary = $form['#vocabulary'];
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index e670c8413..27cff6cd8 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -689,13 +689,11 @@ function upload_js() {
 
   // Render the form for output.
   $form += array(
-    '#post' => $_POST,
-    '#programmed' => FALSE,
     '#tree' => FALSE,
     '#parents' => array(),
   );
   drupal_alter('form', $form, array(), 'upload_js');
-  $form_state = array('submitted' => FALSE);
+  $form_state = array('submitted' => FALSE, 'programmed' => FALSE);
   $form = form_builder('upload_js', $form, $form_state);
   $output = theme('status_messages') . drupal_render($form);
 
diff --git a/modules/user/user.module b/modules/user/user.module
index edd21ebdc..76fd2834d 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2164,7 +2164,7 @@ function user_multiple_role_edit($accounts, $operation, $rid) {
 }
 
 function user_multiple_cancel_confirm(&$form_state) {
-  $edit = $form_state['post'];
+  $edit = $form_state['input'];
 
   $form['accounts'] = array('#prefix' => '<ul>', '#suffix' => '</ul>', '#tree' => TRUE);
   // array_filter() returns only elements with TRUE values.
-- 
cgit v1.2.3