aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2016-05-17 16:53:20 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2016-05-20 18:30:34 -0700
commit0ce7eae7418f1b9bb06b351c1f26d50c3674c0d0 (patch)
tree376411b06eefbfde4972fe910b0d88e5ea13229c /actionpack
parent5929853524d350a846111666303cb2f8a8507024 (diff)
downloadrails-0ce7eae7418f1b9bb06b351c1f26d50c3674c0d0.tar.gz
rails-0ce7eae7418f1b9bb06b351c1f26d50c3674c0d0.tar.bz2
rails-0ce7eae7418f1b9bb06b351c1f26d50c3674c0d0.zip
Make sure the cache is always populated
This way we don't have to make multiple calls on anonymous controllers
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/abstract_controller/base.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index d4317399ed..e90886775e 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -94,7 +94,11 @@ module AbstractController
# ==== Returns
# * <tt>String</tt>
def controller_path
- @controller_path ||= name.sub(/Controller$/, ''.freeze).underscore unless anonymous?
+ @controller_path ||= if anonymous?
+ superclass.controller_path
+ else
+ name.sub(/Controller$/, ''.freeze).underscore
+ end
end
# Refresh the cached action_methods when a new action_method is added.