- Patch #648170 by fago, sun: form constructors cannot enable form caching or form rebuilding.

1 files changed, 2 insertions, 5 deletions

diff --git a/includes/form.inc b/includes/form.inc
index 9875c1b0a..0955dfd0f 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -328,9 +328,8 @@ function drupal_rebuild_form($form_id, &$form_state, $form_build_id = NULL) {
   drupal_prepare_form($form_id, $form, $form_state);
 
   if (empty($form_state['no_cache'])) {
-    // We cache the form structure so it can be retrieved later for validation.
-    // If $form_state['storage'] is populated, we also cache it so that it can
-    // be used to resume complex multi-step processes.
+    // We cache the form structure and the form state so it can be retrieved
+    // later for validation.
     form_set_cache($form_build_id, $form, $form_state);
   }
 
@@ -396,8 +395,6 @@ function form_state_keys_no_cache() {
   return array(
     // Public properties defined by form constructors and form handlers.
     'always_process',
-    'cache',
-    'no_cache',
     'must_validate',
     'rebuild',
     'redirect',