From 625f7b5a5b12df3e7684b1be29c71c1f79a7c7b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 26 Aug 2010 18:17:50 -0300
Subject: Be sure to call helper :all just on direct children. (Tests by Jesse
 Storimer)

---
 actionpack/lib/action_controller/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_controller')

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)
-- 
cgit v1.2.3