diff options
| author | Andreas Neuhaus <zargony@zargony.com> | 2008-05-10 17:54:09 +0200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-05-11 18:30:10 +1200 |
| commit | 74eed6290e63111d1aad2b181692a84f4f040aea (patch) | |
| tree | c135f4062dce31d8dabf39753f1a1256f4776d16 /actionpack/lib/action_controller | |
| parent | a7ea06b4ebe252e258f83e7de945b4baa30ec3bc (diff) | |
| download | rails-74eed6290e63111d1aad2b181692a84f4f040aea.tar.gz rails-74eed6290e63111d1aad2b181692a84f4f040aea.tar.bz2 rails-74eed6290e63111d1aad2b181692a84f4f040aea.zip | |
Fixed flash.now not being accessible in tests. Flash sweeping is now done before action processing instead after
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#10 state:resolved]
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/flash.rb | 7 |
1 files changed, 1 insertions, 6 deletions
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 |