diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-07 06:11:56 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-07 06:11:56 +0000 |
commit | 2399a223c35622178ea58db6629cfd26f2230d60 (patch) | |
tree | 5a3c5fc32560643eb042631a3f23f357eb74ca09 /actionpack/lib/action_controller/components.rb | |
parent | 2bf8f2307e3f13a7b6cf703cdb954cc9a3f5244d (diff) | |
download | rails-2399a223c35622178ea58db6629cfd26f2230d60.tar.gz rails-2399a223c35622178ea58db6629cfd26f2230d60.tar.bz2 rails-2399a223c35622178ea58db6629cfd26f2230d60.zip |
Deprecation! @session and @flash will be removed after 1.2. Use the session and flash methods instead. You'll get printed warnings during tests and logged warnings in dev mode when you access either instance variable directly.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4699 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/components.rb')
-rw-r--r-- | actionpack/lib/action_controller/components.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb index 4d5dc20ab1..c05b1eb068 100644 --- a/actionpack/lib/action_controller/components.rb +++ b/actionpack/lib/action_controller/components.rb @@ -111,16 +111,15 @@ module ActionController #:nodoc: end def flash_with_components(refresh = false) #:nodoc: - if !defined?(@flash) || refresh - @flash = + if !defined?(@_flash) || refresh + @_flash = if defined?(@parent_controller) @parent_controller.flash else flash_without_components end end - - @flash + @_flash end private |