aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAndy Lindeman <andy@highgroove.com>2011-05-16 23:10:21 -0400
committerDavid Chelimsky <dchelimsky@gmail.com>2011-05-17 06:57:04 -0400
commitee82e1c3015392c87c88ee32003763210a75d1ec (patch)
tree0247276f40924de4374c11ee51dc5975c210812c /actionpack
parent14d5e3e45901f104adce36a762a8e543a694d3ef (diff)
downloadrails-ee82e1c3015392c87c88ee32003763210a75d1ec.tar.gz
rails-ee82e1c3015392c87c88ee32003763210a75d1ec.tar.bz2
rails-ee82e1c3015392c87c88ee32003763210a75d1ec.zip
Add fix for error when an anonymous controller subclasses ApplicationController
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/params_wrapper.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index aa7c1e09c2..b7c46919fe 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -140,6 +140,9 @@ module ActionController
# This method also does namespace lookup. Foo::Bar::UsersController will
# try to find Foo::Bar::User, Foo::User and finally User.
def _default_wrap_model #:nodoc:
+ # Return nil if the class is unnamed (i.e., anonymous)
+ return nil if self.name.nil?
+
model_name = self.name.sub(/Controller$/, '').singularize
begin
@@ -168,7 +171,7 @@ module ActionController
end
end
- unless options[:name]
+ unless options[:name] || self.name.nil?
model ||= _default_wrap_model
options[:name] = model ? model.to_s.demodulize.underscore :
controller_name.singularize