diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/flash.rb | 23 |
2 files changed, 18 insertions, 7 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 2674fe0680..28eef311fd 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Don't put flash in session if sessions are disabled. [Jeremy Kemper] + * Strip out trailing &_= for raw post bodies. Closes #2868. [Sam Stephenson] * Pass multiple arguments to Element.show and Element.hide in JavaScriptGenerator instead of using iterators. [Sam Stephenson] diff --git a/actionpack/lib/action_controller/flash.rb b/actionpack/lib/action_controller/flash.rb index 06c8c4b5c6..9eac5784fd 100644 --- a/actionpack/lib/action_controller/flash.rb +++ b/actionpack/lib/action_controller/flash.rb @@ -132,22 +132,31 @@ module ActionController #:nodoc: end end end - - + + protected # Access the contents of the flash. Use <tt>flash["notice"]</tt> to read a notice you put there or # <tt>flash["notice"] = "hello"</tt> to put a new one. + # Note that if sessions are disabled only flash.now will work. def flash #:doc: - @session['flash'] ||= FlashHash.new + # @session = Hash.new if sessions are disabled + if @session.is_a?(Hash) + @__flash ||= FlashHash.new + + # otherwise, @session is a CGI::Session or a TestSession + else + @session['flash'] ||= FlashHash.new + end end - + # deprecated. use <tt>flash.keep</tt> instead def keep_flash #:doc: + warn 'keep_flash is deprecated; use flash.keep instead.' flash.keep end - - - private + + + private # marks flash entries as used and expose the flash to the view def fire_flash |