aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/engine.rb
diff options
context:
space:
mode:
authorPhil Smith <phil.h.smith@gmail.com>2010-04-19 12:43:42 -0700
committerMichael Koziarski <michael@koziarski.com>2010-04-20 08:53:46 +1200
commitd03196c89e92e9b3aa553bf5f7a9bcb23c955025 (patch)
treeaebfcb0dfc112375fb883a60cb8f265e791268d6 /railties/lib/rails/engine.rb
parent69bd542d61bbc2a5c23aac98f01f74f46dead65a (diff)
downloadrails-d03196c89e92e9b3aa553bf5f7a9bcb23c955025.tar.gz
rails-d03196c89e92e9b3aa553bf5f7a9bcb23c955025.tar.bz2
rails-d03196c89e92e9b3aa553bf5f7a9bcb23c955025.zip
Regexp.escape(load_path) in add_routing_namespaces initializer [#4442 state:resolved]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Diffstat (limited to 'railties/lib/rails/engine.rb')
-rw-r--r--railties/lib/rails/engine.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 0f33b40a13..98da7e2b4a 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -166,7 +166,7 @@ module Rails
paths.app.controllers.to_a.each do |load_path|
load_path = File.expand_path(load_path)
Dir["#{load_path}/*/**/*_controller.rb"].collect do |path|
- namespace = File.dirname(path).sub(/#{load_path}\/?/, '')
+ namespace = File.dirname(path).sub(/#{Regexp.escape(load_path)}\/?/, '')
app.routes.controller_namespaces << namespace unless namespace.empty?
end
end