aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-11-26 22:41:28 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-11-26 22:41:28 +0000
commit5e94f053cb52bac19bb0d5bb41bc52113c5a2078 (patch)
treef181b7d411df465f03af0ade7b6620f4874aae70 /actionpack/lib/action_controller
parenta0c925c0a37c2ef4d8774dcce93c3da187e2d76d (diff)
downloadrails-5e94f053cb52bac19bb0d5bb41bc52113c5a2078.tar.gz
rails-5e94f053cb52bac19bb0d5bb41bc52113c5a2078.tar.bz2
rails-5e94f053cb52bac19bb0d5bb41bc52113c5a2078.zip
Fixed to_s bug with namespace routes (closes #10283) [johnb]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8216 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/routing.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 1b7eb74db1..4baea24572 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -1012,7 +1012,7 @@ module ActionController
path = "/#{path}" unless path[0] == ?/
path = "#{path}/" unless path[-1] == ?/
- path = "/#{options[:path_prefix].gsub(/^\//,'')}#{path}" if options[:path_prefix]
+ path = "/#{options[:path_prefix].to_s.gsub(/^\//,'')}#{path}" if options[:path_prefix]
segments = segments_for_route_path(path)
defaults, requirements, conditions = divide_route_options(segments, options)