From 74eed6290e63111d1aad2b181692a84f4f040aea Mon Sep 17 00:00:00 2001 From: Andreas Neuhaus Date: Sat, 10 May 2008 17:54:09 +0200 Subject: Fixed flash.now not being accessible in tests. Flash sweeping is now done before action processing instead after Signed-off-by: Michael Koziarski [#10 state:resolved] --- actionpack/lib/action_controller/flash.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/flash.rb b/actionpack/lib/action_controller/flash.rb index 692168f230..0148fb5c04 100644 --- a/actionpack/lib/action_controller/flash.rb +++ b/actionpack/lib/action_controller/flash.rb @@ -28,7 +28,6 @@ module ActionController #:nodoc: base.class_eval do include InstanceMethods alias_method_chain :assign_shortcuts, :flash - alias_method_chain :process_cleanup, :flash alias_method_chain :reset_session, :flash end end @@ -166,11 +165,7 @@ module ActionController #:nodoc: def assign_shortcuts_with_flash(request, response) #:nodoc: assign_shortcuts_without_flash(request, response) flash(:refresh) - end - - def process_cleanup_with_flash - flash.sweep if @_session - process_cleanup_without_flash + flash.sweep if @_session && !component_request? end end end -- cgit v1.2.3