Apply the changes from D6LTS 6.54

pressflow · Aug 12, 2020 · 670d18f · 670d18f
1 parent 424a281
commit 670d18f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/includes/form.inc b/includes/form.inc
@@ -634,6 +634,13 @@ function drupal_validate_form($form_id, $form, &$form_state) {
       // could invoke non-safe operations which opens the door for CSRF
       // vulnerabilities.
       $validated_forms[$form_id] = TRUE;
+      // Ignore all submitted values.
+      $form_state['post'] = array();
+      $form_state['input'] = array();
+      $form['#post'] = array();
+      $form['#input'] = array();
+      $_POST = array();
+      $_FILES = array();
       return;
     }
   }
@@ -943,7 +950,12 @@ function form_builder($form_id, $form, &$form_state) {
           form_set_error('form_token', t('Validation error, please try again. If this error persists, please contact the site administrator.'));
           // This value is checked in _form_builder_handle_input_element().
           $form_state['invalid_token'] = TRUE;
-          // Make sure file uploads do not get processed.
+          // Ignore all submitted values.
+          $form_state['post'] = array();
+          $form_state['input'] = array();
+          $form['#post'] = array();
+          $form['#input'] = array();
+          $_POST = array();
           $_FILES = array();
         }
       }

diff --git a/modules/system/system.module b/modules/system/system.module
@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '6.53');
+define('VERSION', '6.54');
 
 /**
  * Core API compatibility.