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
This commit is contained in:
Jeremy Kemper 2007-10-24 04:47:40 +00:00
parent a2c9c92b72
commit 4c2920e89c
4 changed files with 1 additions and 9 deletions

View File

@ -761,7 +761,6 @@ module ActionController #:nodoc:
def halt_filter_chain(filter, reason)
@before_filter_chain_aborted = true
logger.info "Filter chain halted as [#{filter.inspect}] #{reason}." if logger
false
end
end
end

View File

@ -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

View File

@ -98,10 +98,7 @@ module ActionController #:nodoc:
options[:redirect_to] = self.send!(options[:redirect_to]) if options[:redirect_to].is_a? Symbol
redirect_to(options[:redirect_to]) if options[:redirect_to]
end
return false
end
true
end
private :verify_action
end

View File

@ -70,7 +70,6 @@ class FlashTest < Test::Unit::TestCase
flash["foo"] = "bar"
redirect_to :action => "std_action"
@flash_copy = {}.update(flash)
false
end
end