1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/flash.rb b/actionpack/lib/action_controller/flash.rb
index 61ac33f399..ea7a49ab77 100644
--- a/actionpack/lib/action_controller/flash.rb
+++ b/actionpack/lib/action_controller/flash.rb
@@ -30,6 +30,7 @@ module ActionController #:nodoc:
       base.class_eval do
         alias_method_chain :assign_shortcuts, :flash
         alias_method_chain :process_cleanup, :flash
+        alias_method_chain :reset_session, :flash
       end
     end
     
@@ -143,6 +144,11 @@ module ActionController #:nodoc:
         flash.sweep if @session
         process_cleanup_without_flash
       end
+
+      def reset_session_with_flash
+        reset_session_without_flash
+        @flash = nil
+      end
       
       protected 
         # Access the contents of the flash. Use <tt>flash["notice"]</tt> to read a notice you put there or 
@@ -172,4 +178,4 @@ module ActionController #:nodoc:
         end
     end
   end
-end
-\ No newline at end of file
+end