diff options
| author | Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local> | 2009-06-23 14:04:04 -0700 |
|---|---|---|
| committer | Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local> | 2009-06-23 14:06:22 -0700 |
| commit | 4417a19b035d73eb46a5e06e296a4b1c8091bef1 (patch) | |
| tree | d3b6c5e5000803aaebc8031c06579f3e21299b34 /actionpack/lib/action_controller/base | |
| parent | 80f1f863cd0f9cba89079511282de5710a2e1832 (diff) | |
| download | rails-4417a19b035d73eb46a5e06e296a4b1c8091bef1.tar.gz rails-4417a19b035d73eb46a5e06e296a4b1c8091bef1.tar.bz2 rails-4417a19b035d73eb46a5e06e296a4b1c8091bef1.zip | |
Small changes to get 1.9 passing (for the most part)
Diffstat (limited to 'actionpack/lib/action_controller/base')
| -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 |