Permalink
Browse files

Don't put flash in session if sessions are disabled.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3151 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent d345b7a commit 658066225492589a157c4c4cc208257692732ba7 @jeremy jeremy committed Nov 21, 2005
Showing with 18 additions and 7 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +16 −7 actionpack/lib/action_controller/flash.rb
View
@@ -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]
@@ -132,22 +132,31 @@ def use(k=nil, v=true)
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

0 comments on commit 6580662

Please sign in to comment.