From 658066225492589a157c4c4cc208257692732ba7 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 21 Nov 2005 18:09:28 +0000 Subject: 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 --- actionpack/lib/action_controller/flash.rb | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'actionpack/lib/action_controller/flash.rb') 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 flash["notice"] to read a notice you put there or # flash["notice"] = "hello" 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 flash.keep 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 -- cgit v1.2.3