aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/routing.rb
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-11-22 16:31:00 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-11-22 16:31:00 +0000
commitd1529a71d120a8533f7e042b8e92698428c7a3a1 (patch)
tree0d5453e026d1fe77b7c8d37313a3ebe2681c1a88 /actionpack/lib/action_controller/routing.rb
parenta2e826dc0f32647d8e4ae68214d717a5f3fc15df (diff)
downloadrails-d1529a71d120a8533f7e042b8e92698428c7a3a1.tar.gz
rails-d1529a71d120a8533f7e042b8e92698428c7a3a1.tar.bz2
rails-d1529a71d120a8533f7e042b8e92698428c7a3a1.zip
Update Routing to complain when :controller is not specified by a route. Closes #6669.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5607 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
-rw-r--r--actionpack/lib/action_controller/routing.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 3c53acc164..2fe74c5b34 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -950,6 +950,10 @@ module ActionController
route.significant_keys << :action
end
+ if !route.significant_keys.include?(:controller)
+ raise ArgumentError, "Illegal route: the :controller must be specified!"
+ end
+
route
end
end