diff options
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/filters.rb | 8 | ||||
-rw-r--r-- | actionpack/lib/action_controller/flash.rb | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb index d87df2577c..58f0ca491d 100644 --- a/actionpack/lib/action_controller/filters.rb +++ b/actionpack/lib/action_controller/filters.rb @@ -672,7 +672,6 @@ module ActionController #:nodoc: base.class_eval do alias_method_chain :perform_action, :filters alias_method_chain :process, :filters - alias_method_chain :process_cleanup, :filters end end @@ -748,13 +747,6 @@ module ActionController #:nodoc: call_filters(self.class.filter_chain, 0, 0) end - def process_cleanup_with_filters - if @before_filter_chain_aborted - close_session - else - process_cleanup_without_filters - end - end end end end diff --git a/actionpack/lib/action_controller/flash.rb b/actionpack/lib/action_controller/flash.rb index 2544db2fda..534c74745e 100644 --- a/actionpack/lib/action_controller/flash.rb +++ b/actionpack/lib/action_controller/flash.rb @@ -63,7 +63,7 @@ module ActionController #:nodoc: end def update(h) #:nodoc: - h.keys.each{ |k| discard(k) } + h.keys.each { |k| keep(k) } super end |