diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-07-26 17:33:22 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-07-26 17:33:22 -0700 |
| commit | ba43b9bf5f8a85759939462944f4994c9b1e1ac9 (patch) | |
| tree | 48c5b09cf9c5239c02d81f1b46655e8817413e1d /actionpack/lib/action_dispatch/routing/mapper.rb | |
| parent | e4a7b23d382d9cf66771c0ce3eefe35c08e3711a (diff) | |
| download | rails-ba43b9bf5f8a85759939462944f4994c9b1e1ac9.tar.gz rails-ba43b9bf5f8a85759939462944f4994c9b1e1ac9.tar.bz2 rails-ba43b9bf5f8a85759939462944f4994c9b1e1ac9.zip | |
fixing wildcard path matching when wildcard is inside parenthesis
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
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 003bc1dc2c..ee4d405ce7 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -51,7 +51,7 @@ module ActionDispatch IGNORE_OPTIONS = [:to, :as, :via, :on, :constraints, :defaults, :only, :except, :anchor, :shallow, :shallow_path, :shallow_prefix] ANCHOR_CHARACTERS_REGEX = %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z} SHORTHAND_REGEX = %r{^/[\w/]+$} - WILDCARD_PATH = %r{\*([^/]+)$} + WILDCARD_PATH = %r{\*([^/\)]+)\)?$} def initialize(set, scope, path, options) @set, @scope = set, scope |