aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-02-02 09:54:23 -0800
committerYehuda Katz <wycats@gmail.com>2009-02-02 09:54:23 -0800
commit44cdf0c5fe080d470429ab0640af25e927244907 (patch)
tree0dcaa131da49eaeb0e056d0b4cc03673bf5af4c2 /actionpack/lib/action_controller
parent3030bc90c95e335d726f06fd7a61ed96055e9109 (diff)
downloadrails-44cdf0c5fe080d470429ab0640af25e927244907.tar.gz
rails-44cdf0c5fe080d470429ab0640af25e927244907.tar.bz2
rails-44cdf0c5fe080d470429ab0640af25e927244907.zip
Some merge cleanup
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
index a01d8f25cc..29d87d8125 100644
--- a/actionpack/lib/action_controller/base/base.rb
+++ b/actionpack/lib/action_controller/base/base.rb
@@ -862,7 +862,7 @@ module ActionController #:nodoc:
end
def close_session
- @_session.close if @_session && @_session.respond_to?(:close)
+ # @_session.close if @_session && @_session.respond_to?(:close)
end
def default_template(action_name = self.action_name)
@@ -895,7 +895,7 @@ module ActionController #:nodoc:
Base.class_eval do
[ Filters, Layout, Renderer, Redirector, Responder, Benchmarking, Rescue, Flash, MimeResponds, Helpers,
Cookies, Caching, Verification, Streaming, SessionManagement,
- HttpAuthentication::Basic::ControllerMethods, RecordIdentifier,
+ HttpAuthentication::Basic::ControllerMethods, HttpAuthentication::Digest::ControllerMethods, RecordIdentifier,
RequestForgeryProtection, Translation
].each do |mod|
include mod