diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-05-11 23:50:08 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-11 23:50:08 +0100 |
| commit | cb50a2880759f311148abda55ab60be772b8aa51 (patch) | |
| tree | 3f8f851f332c0976349de9dc2b4a722946b4cc5e /actionpack/lib/action_controller/flash.rb | |
| parent | 35634feb474cc55fbc95edeffe98cec241d45f23 (diff) | |
| parent | 9a137506a1267ec5938fcec4d2ff135f15037459 (diff) | |
| download | rails-cb50a2880759f311148abda55ab60be772b8aa51.tar.gz rails-cb50a2880759f311148abda55ab60be772b8aa51.tar.bz2 rails-cb50a2880759f311148abda55ab60be772b8aa51.zip | |
Merge commit 'mainstream/master'
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 |