diff options
| author | rick <rick@spacemonkey.local> | 2008-05-13 09:41:10 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-13 09:41:10 -0700 |
| commit | 74fd17346f30fddba0e174ae17f5697f2c22279e (patch) | |
| tree | 1267cea613ee4a73a2f5ddf3fb24d224dc8bbded /actionpack/lib/action_controller/flash.rb | |
| parent | d09a8446d5606a5a0b5c024224b09a1318e9cf4d (diff) | |
| parent | 4dedc7ddcaffa8c606af11ae2d32707131b99a2e (diff) | |
| download | rails-74fd17346f30fddba0e174ae17f5697f2c22279e.tar.gz rails-74fd17346f30fddba0e174ae17f5697f2c22279e.tar.bz2 rails-74fd17346f30fddba0e174ae17f5697f2c22279e.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/flash.rb')
| -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 |