diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-07-26 17:33:22 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-08-13 16:22:19 -0700 |
| commit | f445bb26715406a5718bbf4652bbfa4d8be0b60d (patch) | |
| tree | 0b2a4da6fab4d8a2a1c3e933e5e0b15f56e9a061 /actionpack/lib | |
| parent | ab422b04a2fd8144a26d82f2ec1efeeb684b29db (diff) | |
| download | rails-f445bb26715406a5718bbf4652bbfa4d8be0b60d.tar.gz rails-f445bb26715406a5718bbf4652bbfa4d8be0b60d.tar.bz2 rails-f445bb26715406a5718bbf4652bbfa4d8be0b60d.zip | |
fixing wildcard path matching when wildcard is inside parenthesis
Diffstat (limited to 'actionpack/lib')
| -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 |