aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-07-22 02:31:21 +0000
committerRick Olson <technoweenie@gmail.com>2006-07-22 02:31:21 +0000
commit04d9e94e88be0ba076b0fef980e8bde8e25061d9 (patch)
tree490b3d5aa23518fd8e0da335ce9390387b85a565 /actionpack/lib
parent3a0159dd1e66a53d2ee39b3a3625998706cd8ae6 (diff)
downloadrails-04d9e94e88be0ba076b0fef980e8bde8e25061d9.tar.gz
rails-04d9e94e88be0ba076b0fef980e8bde8e25061d9.tar.bz2
rails-04d9e94e88be0ba076b0fef980e8bde8e25061d9.zip
Fixed that you can still access the flash after the flash has been reset in reset_session. Closes #5584 [lmarlow@yahoo.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/flash.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/flash.rb b/actionpack/lib/action_controller/flash.rb
index 5751fe6e93..623ce2f4ba 100644
--- a/actionpack/lib/action_controller/flash.rb
+++ b/actionpack/lib/action_controller/flash.rb
@@ -147,7 +147,8 @@ module ActionController #:nodoc:
def reset_session_with_flash
reset_session_without_flash
- @flash = nil
+ remove_instance_variable(:@flash)
+ flash(:refresh)
end
protected