diff options
author | José Valim <jose.valim@gmail.com> | 2010-08-26 18:17:50 -0300 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-08-26 18:20:22 -0300 |
commit | 625f7b5a5b12df3e7684b1be29c71c1f79a7c7b7 (patch) | |
tree | 3ac26d40469e91bb11e6a20d2f48854e215e92ed /actionpack/lib | |
parent | 737abf25bbafbf501dee4144abf13657217da0d2 (diff) | |
download | rails-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')
-rw-r--r-- | actionpack/lib/abstract_controller.rb | 1 | ||||
-rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb index c565c940a1..f8fc79936f 100644 --- a/actionpack/lib/abstract_controller.rb +++ b/actionpack/lib/abstract_controller.rb @@ -2,6 +2,7 @@ activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__) $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path) require 'action_pack' +require 'active_support/concern' require 'active_support/ruby/shim' require 'active_support/dependencies/autoload' require 'active_support/core_ext/class/attribute' 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) |