diff options
| author | José Valim <jose.valim@gmail.com> | 2009-06-25 10:38:17 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-06-25 10:38:17 +0200 |
| commit | b72d9667070521f2b40a3b307d7e5c7c66f83385 (patch) | |
| tree | c065114f5c58ecf0594ad4a4b59483b031cda752 /actionpack/lib/action_controller/base/http.rb | |
| parent | 8843b91da70d7e4a51f7337db218489a5713dc16 (diff) | |
| parent | 3aad4d7fbec6b0881733d3a9b2aff756f775ad35 (diff) | |
| download | rails-b72d9667070521f2b40a3b307d7e5c7c66f83385.tar.gz rails-b72d9667070521f2b40a3b307d7e5c7c66f83385.tar.bz2 rails-b72d9667070521f2b40a3b307d7e5c7c66f83385.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/base/http.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base/http.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base/http.rb b/actionpack/lib/action_controller/base/http.rb index 2e73561f93..ec78bc15a8 100644 --- a/actionpack/lib/action_controller/base/http.rb +++ b/actionpack/lib/action_controller/base/http.rb @@ -36,7 +36,7 @@ module ActionController # ==== Returns # String def self.controller_path - @controller_path ||= self.name.sub(/Controller$/, '').underscore + @controller_path ||= name && name.sub(/Controller$/, '').underscore end # Delegates to the class' #controller_path |