Changeset 4540

Timestamp:

07/05/06 01:14:53 (2 years ago)

Author:

david

Message:

Fixed that the flash should be reset when reset_session is called (closes #5584) [shugo@ruby-lang.org]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/flash.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that the flash should be reset when reset_session is called #5584 [shugo@ruby-lang.org]
-
-* Added special case for "1 Byte" in NumberHelper#number_to_human_size #5593 [murpyh@rubychan.de]

trunk/actionpack/lib/action_controller/flash.rb

@@ -31 +31 @@
-        alias_method_chain :assign_shortcuts, :flash
-        alias_method_chain :process_cleanup, :flash
+        alias_method_chain :reset_session, :flash
-      end
-    end
@@ -144 +145 @@
-        process_cleanup_without_flash
-      end
+
+      def reset_session_with_flash
+        reset_session_without_flash
+        @flash = nil
+      end
-      
-      protected