diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-24 04:47:40 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-24 04:47:40 +0000 |
| commit | 4c2920e89c563f9e5e9c79c7da7d226cdddcc859 (patch) | |
| tree | ec7387332e61dbd6564edd7ccc26822fc4c4d9bd /actionpack/lib/action_controller/http_authentication.rb | |
| parent | a2c9c92b720cb66211e75adec178ac46e3cd7d92 (diff) | |
| download | rails-4c2920e89c563f9e5e9c79c7da7d226cdddcc859.tar.gz rails-4c2920e89c563f9e5e9c79c7da7d226cdddcc859.tar.bz2 rails-4c2920e89c563f9e5e9c79c7da7d226cdddcc859.zip | |
Remove unnecessary returns from builtin filters since render/return is now sufficient. Closes #9952 [Josh Peek]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8009 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/http_authentication.rb')
| -rw-r--r-- | actionpack/lib/action_controller/http_authentication.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/http_authentication.rb b/actionpack/lib/action_controller/http_authentication.rb index 170098dc58..18a503c3ad 100644 --- a/actionpack/lib/action_controller/http_authentication.rb +++ b/actionpack/lib/action_controller/http_authentication.rb @@ -93,9 +93,7 @@ module ActionController end def authenticate(controller, &login_procedure) - if authorization(controller.request).blank? - false - else + unless authorization(controller.request).blank? login_procedure.call(*user_name_and_password(controller.request)) end end @@ -122,7 +120,6 @@ 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 - return false end end end |