aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-27 17:12:35 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-27 17:12:35 +0000
commit630638b00e01d4046d439867a37c15cd037f6c00 (patch)
treeb3b9b42471c3d4d1e7cd956b6fcd3a5d1caf4cfd /actionpack/lib/action_controller
parent8cddbf0d37c557688bf833e5437a88d98cfaf046 (diff)
downloadrails-630638b00e01d4046d439867a37c15cd037f6c00.tar.gz
rails-630638b00e01d4046d439867a37c15cd037f6c00.tar.bz2
rails-630638b00e01d4046d439867a37c15cd037f6c00.zip
Fixed that Routes would raise NameErrors if a controller component contains characters that are not valid constant names #733 [Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@803 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/routing.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index d270defa4d..ab568b6595 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -134,6 +134,7 @@ module ActionController
def eat_path_to_controller(path)
path.inject([Controllers, 1]) do |(mod, length), name|
name = name.camelize
+ return nil, nil unless /^[A-Z][_a-zA-Z\d]*$/ =~ name
controller_name = name + "Controller"
return mod.const_get(controller_name), path[length..-1] if mod.const_available? controller_name
return nil, nil unless mod.const_available? name