diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-07-04 00:33:56 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-07-04 00:33:56 +0100 |
| commit | 0a7923ea7a76c1136bddfe638a600c62457df751 (patch) | |
| tree | 2709c19133af9342958fc51b36ad53ca56c2927a /actionpack/lib/action_controller/routing/builder.rb | |
| parent | 5dba6c024289e42c31894b7d13c1695049fcf30d (diff) | |
| parent | 1a478923dc909bf7b6aea4f2ad49cbeee6dea259 (diff) | |
| download | rails-0a7923ea7a76c1136bddfe638a600c62457df751.tar.gz rails-0a7923ea7a76c1136bddfe638a600c62457df751.tar.bz2 rails-0a7923ea7a76c1136bddfe638a600c62457df751.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/routing/builder.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing/builder.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/routing/builder.rb b/actionpack/lib/action_controller/routing/builder.rb index 4740113ed0..b8323847fd 100644 --- a/actionpack/lib/action_controller/routing/builder.rb +++ b/actionpack/lib/action_controller/routing/builder.rb @@ -67,10 +67,9 @@ module ActionController options = options.dup if options[:namespace] - options[:controller] = "#{options[:path_prefix]}/#{options[:controller]}" + options[:controller] = "#{options.delete(:namespace).sub(/\/$/, '')}/#{options[:controller]}" options.delete(:path_prefix) options.delete(:name_prefix) - options.delete(:namespace) end requirements = (options.delete(:requirements) || {}).dup |