Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.174.2.14
diff -u -r1.174.2.14 form.inc
--- includes/form.inc	4 Aug 2008 04:00:24 -0000	1.174.2.14
+++ includes/form.inc	11 Aug 2008 23:41:16 -0000
@@ -381,16 +381,9 @@
  *
  */
 function drupal_validate_form($form_id, $form) {
-  global $form_values;
-  static $validated_forms = array();
-
-  if (isset($validated_forms[$form_id])) {
-    return;
-  }
-
   // If the session token was set by drupal_prepare_form(), ensure that it
   // matches the current user's session.
-  if (isset($form['#token'])) {
+  if (isset($form['#token']) && isset($form_values)) {
     if (!drupal_valid_token($form_values['form_token'], $form['#token'])) {
       // Setting this error will cause the form to fail validation.
       form_set_error('form_token', t('Validation error, please try again. If this error persists, please contact the site administrator.'));
@@ -398,7 +391,6 @@
   }
 
   _form_validate($form, $form_id);
-  $validated_forms[$form_id] = TRUE;
 }
 
 /**