diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-12-20 20:00:04 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-12-20 20:00:04 -0600 |
commit | 0f8a5c7954bfc134f46eeb72c4cc8744825cbb5a (patch) | |
tree | cf02e3279577192db707ba12cef1471b7c8c78ba /actionpack/lib/action_controller/metal/flash.rb | |
parent | b4ecb5555100cc67011637d261e5de30f5b7fcba (diff) | |
download | rails-0f8a5c7954bfc134f46eeb72c4cc8744825cbb5a.tar.gz rails-0f8a5c7954bfc134f46eeb72c4cc8744825cbb5a.tar.bz2 rails-0f8a5c7954bfc134f46eeb72c4cc8744825cbb5a.zip |
Merge Session stuff into RackConvenience
Diffstat (limited to 'actionpack/lib/action_controller/metal/flash.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/flash.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/flash.rb b/actionpack/lib/action_controller/metal/flash.rb index ae343444e2..581ff6109e 100644 --- a/actionpack/lib/action_controller/metal/flash.rb +++ b/actionpack/lib/action_controller/metal/flash.rb @@ -28,8 +28,6 @@ module ActionController #:nodoc: module Flash extend ActiveSupport::Concern - include Session - included do helper_method :alert, :notice end @@ -155,7 +153,7 @@ module ActionController #:nodoc: def alert flash[:alert] end - + # Convenience accessor for flash[:alert]= def alert=(message) flash[:alert] = message @@ -165,7 +163,7 @@ module ActionController #:nodoc: def notice flash[:notice] end - + # Convenience accessor for flash[:notice]= def notice=(message) flash[:notice] = message @@ -193,11 +191,11 @@ module ActionController #:nodoc: if notice = response_status_and_flash.delete(:notice) flash[:notice] = notice end - + if other_flashes = response_status_and_flash.delete(:flash) flash.update(other_flashes) end - + super(options, response_status_and_flash) end end |