diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-04-03 11:17:44 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-04-03 11:17:44 -0700 |
| commit | 77a3bc476800a666dc89c40ddd73fe505fa5959b (patch) | |
| tree | 2b36b9e0c23d8a94db61cf1972ccf834f11d00ea /activesupport | |
| parent | e632d035db36092236f01ab1553405de65245d64 (diff) | |
| parent | 2282964de77eae623284c2cd47cb2f21045b290f (diff) | |
| download | rails-77a3bc476800a666dc89c40ddd73fe505fa5959b.tar.gz rails-77a3bc476800a666dc89c40ddd73fe505fa5959b.tar.bz2 rails-77a3bc476800a666dc89c40ddd73fe505fa5959b.zip | |
Merge pull request #10078 from vipulnsward/railties_warning_fix_v1
Fix some railties test warnings
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/log_subscriber.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/log_subscriber.rb b/activesupport/lib/active_support/log_subscriber.rb index 21a04a9152..c4b64bd1a6 100644 --- a/activesupport/lib/active_support/log_subscriber.rb +++ b/activesupport/lib/active_support/log_subscriber.rb @@ -53,10 +53,9 @@ module ActiveSupport class << self def logger - if defined?(Rails) && Rails.respond_to?(:logger) - @logger ||= Rails.logger + @logger ||= if defined?(Rails) && Rails.respond_to?(:logger) + Rails.logger end - @logger end attr_writer :logger |