diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-05-29 17:03:23 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-05-29 17:03:23 -0500 |
| commit | 669fd84910586d4c791b6f5bf4320f68ac7845aa (patch) | |
| tree | ec246bdf6fe6fc61219c59837c4bec07ba19e267 /actionpack/lib/action_controller/base/filter_parameter_logging.rb | |
| parent | c7c35be8fe30b3e29a5d05edae767f7d6a286911 (diff) | |
| download | rails-669fd84910586d4c791b6f5bf4320f68ac7845aa.tar.gz rails-669fd84910586d4c791b6f5bf4320f68ac7845aa.tar.bz2 rails-669fd84910586d4c791b6f5bf4320f68ac7845aa.zip | |
AS::Concern redefines "include" to lazy include modules as dependencies
Diffstat (limited to 'actionpack/lib/action_controller/base/filter_parameter_logging.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base/filter_parameter_logging.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/base/filter_parameter_logging.rb b/actionpack/lib/action_controller/base/filter_parameter_logging.rb index 9df286ee24..8370ba6fc0 100644 --- a/actionpack/lib/action_controller/base/filter_parameter_logging.rb +++ b/actionpack/lib/action_controller/base/filter_parameter_logging.rb @@ -4,13 +4,11 @@ module ActionController # TODO : Remove the defined? check when new base is the main base if defined?(ActionController::Http) - depends_on AbstractController::Logger + include AbstractController::Logger end included do - if defined?(ActionController::Http) - include InstanceMethodsForNewBase - end + include InstanceMethodsForNewBase end module ClassMethods |