diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-12-07 20:11:57 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-12-07 20:11:57 -0600 |
| commit | 0c34e3f41ae79bb675c74b697ef92bad59b25f7f (patch) | |
| tree | aa6bccf7232d3b6bfd0253fdca54fe7e9185fa0a /actionpack | |
| parent | 81d7227c9b8f4a74a74cf3b2cb183ce130b3f679 (diff) | |
| download | rails-0c34e3f41ae79bb675c74b697ef92bad59b25f7f.tar.gz rails-0c34e3f41ae79bb675c74b697ef92bad59b25f7f.tar.bz2 rails-0c34e3f41ae79bb675c74b697ef92bad59b25f7f.zip | |
Ignore name_prefix unless there is an explicit name
Diffstat (limited to 'actionpack')
| -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 1a742f61e6..86470c2017 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -235,7 +235,7 @@ module ActionDispatch options = (@scope[:options] || {}).merge(options) - if @scope[:name_prefix] + if @scope[:name_prefix] && options[:as] options[:as] = "#{@scope[:name_prefix]}#{options[:as]}" end |