diff options
| author | Andrew Bloom <akbloom@gmail.com> | 2009-03-09 15:27:13 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-09 15:27:13 +0000 |
| commit | 90dba00822acd1e01f7a39625668ee74ffe5f061 (patch) | |
| tree | 758ccbfd4c4492b1a79acefb71a433d4847a979d /actionpack/lib/action_controller/routing | |
| parent | 1d88a111b596c046e67fd290de0a40161350332b (diff) | |
| download | rails-90dba00822acd1e01f7a39625668ee74ffe5f061.tar.gz rails-90dba00822acd1e01f7a39625668ee74ffe5f061.tar.bz2 rails-90dba00822acd1e01f7a39625668ee74ffe5f061.zip | |
Ensure blank path_prefix works as expected [#2122 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'actionpack/lib/action_controller/routing')
| -rw-r--r-- | actionpack/lib/action_controller/routing/builder.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing/builder.rb b/actionpack/lib/action_controller/routing/builder.rb index 44d759444a..d9590c88b8 100644 --- a/actionpack/lib/action_controller/routing/builder.rb +++ b/actionpack/lib/action_controller/routing/builder.rb @@ -159,7 +159,8 @@ module ActionController path = "/#{path}" unless path[0] == ?/ path = "#{path}/" unless path[-1] == ?/ - path = "/#{options[:path_prefix].to_s.gsub(/^\//,'')}#{path}" if options[:path_prefix] + prefix = options[:path_prefix].to_s.gsub(/^\//,'') + path = "/#{prefix}#{path}" unless prefix.blank? segments = segments_for_route_path(path) defaults, requirements, conditions = divide_route_options(segments, options) |