aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-08-26 18:17:50 -0300
committerJosé Valim <jose.valim@gmail.com>2010-08-26 18:20:22 -0300
commit625f7b5a5b12df3e7684b1be29c71c1f79a7c7b7 (patch)
tree3ac26d40469e91bb11e6a20d2f48854e215e92ed /actionpack/lib/action_controller
parent737abf25bbafbf501dee4144abf13657217da0d2 (diff)
downloadrails-625f7b5a5b12df3e7684b1be29c71c1f79a7c7b7.tar.gz
rails-625f7b5a5b12df3e7684b1be29c71c1f79a7c7b7.tar.bz2
rails-625f7b5a5b12df3e7684b1be29c71c1f79a7c7b7.zip
Be sure to call helper :all just on direct children. (Tests by Jesse Storimer)
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 165bf089c0..d8d3a2335a 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -223,7 +223,7 @@ module ActionController
def self.inherited(klass)
super
- klass.helper :all
+ klass.helper :all if klass.superclass == ActionController::Base
end
ActiveSupport.run_load_hooks(:action_controller, self)