aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/http_authentication.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-09-03 17:44:58 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-09-03 17:44:58 +0100
commit2933f4481f8b70b3b809fab6e818d80c2af1b919 (patch)
treec83d1308545cc82215b90ab37208cc81b4712276 /actionpack/lib/action_controller/http_authentication.rb
parent36ee17d458b86c5f3f371810160e8839d318bbf1 (diff)
parent10fe6a6d8940300dd6698ec38e9c9573404e687d (diff)
downloadrails-2933f4481f8b70b3b809fab6e818d80c2af1b919.tar.gz
rails-2933f4481f8b70b3b809fab6e818d80c2af1b919.tar.bz2
rails-2933f4481f8b70b3b809fab6e818d80c2af1b919.zip
Merge commit 'mainstream/master'
Conflicts: actionpack/lib/action_controller/resources.rb
Diffstat (limited to 'actionpack/lib/action_controller/http_authentication.rb')
-rw-r--r--actionpack/lib/action_controller/http_authentication.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/http_authentication.rb b/actionpack/lib/action_controller/http_authentication.rb
index 31db012ef2..2ed810db7d 100644
--- a/actionpack/lib/action_controller/http_authentication.rb
+++ b/actionpack/lib/action_controller/http_authentication.rb
@@ -117,7 +117,7 @@ module ActionController
def authentication_request(controller, realm)
controller.headers["WWW-Authenticate"] = %(Basic realm="#{realm.gsub(/"/, "")}")
- controller.send! :render, :text => "HTTP Basic: Access denied.\n", :status => :unauthorized
+ controller.__send__ :render, :text => "HTTP Basic: Access denied.\n", :status => :unauthorized
end
end
end