diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-12-10 21:05:10 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-12-10 21:05:10 -0800 |
| commit | 377692e9410922bc508fafb42602187728d421e7 (patch) | |
| tree | cd9aac40d3245d8846cebf755a1e9d5019a9b7a1 | |
| parent | 603e7f7ea507feb3cfea53c42b23be2b32dc240b (diff) | |
| parent | c00e7aa919624e4f26a6bc0a924892a87dbd91c0 (diff) | |
| download | rails-377692e9410922bc508fafb42602187728d421e7.tar.gz rails-377692e9410922bc508fafb42602187728d421e7.tar.bz2 rails-377692e9410922bc508fafb42602187728d421e7.zip | |
Merge pull request #8482 from BanzaiMan/defensive_matching_on_default_index_page
Match the controller and path names defensively.
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/inspector.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb index d7412daec2..8d7461ecc3 100644 --- a/actionpack/lib/action_dispatch/routing/inspector.rb +++ b/actionpack/lib/action_dispatch/routing/inspector.rb @@ -51,7 +51,7 @@ module ActionDispatch end def internal? - controller =~ %r{^rails/info|^rails/welcome} || path =~ %r{^#{Rails.application.config.assets.prefix}} + controller =~ %r{\Arails/(info|welcome)} || path =~ %r{\A#{Rails.application.config.assets.prefix}} end def engine? |