diff options
| author | Andy Lindeman <andy@highgroove.com> | 2011-05-16 23:10:21 -0400 |
|---|---|---|
| committer | David Chelimsky <dchelimsky@gmail.com> | 2011-05-17 06:57:04 -0400 |
| commit | ee82e1c3015392c87c88ee32003763210a75d1ec (patch) | |
| tree | 0247276f40924de4374c11ee51dc5975c210812c /actionpack/lib | |
| parent | 14d5e3e45901f104adce36a762a8e543a694d3ef (diff) | |
| download | rails-ee82e1c3015392c87c88ee32003763210a75d1ec.tar.gz rails-ee82e1c3015392c87c88ee32003763210a75d1ec.tar.bz2 rails-ee82e1c3015392c87c88ee32003763210a75d1ec.zip | |
Add fix for error when an anonymous controller subclasses ApplicationController
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/metal/params_wrapper.rb | 5 |
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 |