aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-08 17:12:50 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-08 17:12:50 -0700
commit5a18b853ed9b04cf7d610390fab7de13cc23108e (patch)
treea314252e6c11bd827ea8ed47b7cced3c113a5201 /actionpack/lib
parent1b73d53a1c45933017dd10d2edc506a4982c4c0d (diff)
downloadrails-5a18b853ed9b04cf7d610390fab7de13cc23108e.tar.gz
rails-5a18b853ed9b04cf7d610390fab7de13cc23108e.tar.bz2
rails-5a18b853ed9b04cf7d610390fab7de13cc23108e.zip
remove useless conditional
`prepare_params!` would raise an exception if `params` wasn't initialized, so it must always be available. Remove the existence conditional from the `controller` method.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index d58293d93b..dd78b9d4fd 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -54,7 +54,7 @@ module ActionDispatch
# delegate the control back to Rack cascade. Besides, if this is not a default
# controller, it means we should respect the @scope[:module] parameter.
def controller(params, raise_on_name_error=true)
- if params && params.key?(:controller)
+ if params.key?(:controller)
controller_param = params[:controller]
controller_reference(controller_param)
else