aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-11 14:50:15 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-11 14:50:15 -0700
commit41e7923cd4d27887d6abb7ace272ea0c6d6b65b1 (patch)
tree927404e7d408b7d25d9aa548469dc4a3bb967f47
parent763dd50a7668c8c291ed454d12fc90d4e935329c (diff)
downloadrails-41e7923cd4d27887d6abb7ace272ea0c6d6b65b1.tar.gz
rails-41e7923cd4d27887d6abb7ace272ea0c6d6b65b1.tar.bz2
rails-41e7923cd4d27887d6abb7ace272ea0c6d6b65b1.zip
path is never nil
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index abef307f3c..7361a6374d 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1567,7 +1567,7 @@ module ActionDispatch
def using_match_shorthand?(path, to, action)
return false if to || action
- path && path =~ %r{^/?[-\w]+/[-\w/]+$}
+ path =~ %r{^/?[-\w]+/[-\w/]+$}
end
def decomposed_match(path, controller, options, _path) # :nodoc: