diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 18:32:35 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 18:32:35 -0800 |
| commit | 91ce8d8b7f4e7ab93dda159595debadd4f659ab9 (patch) | |
| tree | 88e7592f0191eec5a66cdf45375b114d01018fcc /actionpack/lib/action_controller/metal/flash.rb | |
| parent | cf9d6a95e805bdddfa9c6b541631d51b3165bf23 (diff) | |
| parent | 29c8a43056f40759a8c64cbcbd4e71d4283b233d (diff) | |
| download | rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.tar.gz rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.tar.bz2 rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.zip | |
Merge branch 'master' of github.com:rails/rails
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 |