diff options
| -rw-r--r-- | actionpack/lib/action_controller/failsafe.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/deprecation.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/failsafe.rb b/actionpack/lib/action_controller/failsafe.rb index 1cd649b2e1..b1e9957b49 100644 --- a/actionpack/lib/action_controller/failsafe.rb +++ b/actionpack/lib/action_controller/failsafe.rb @@ -42,7 +42,7 @@ module ActionController end def failsafe_logger - if defined? Rails && Rails.logger + if defined?(Rails) && Rails.logger Rails.logger else Logger.new($stderr) diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 23b7aee514..7ce9adec2c 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -559,7 +559,7 @@ module ActiveSupport #:nodoc: # Old style environment.rb referenced this method directly. Please note, it doesn't # actually *do* anything any more. def self.root(*args) - if defined? Rails && Rails.logger + if defined?(Rails) && Rails.logger Rails.logger.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases." Rails.logger.warn "For upgrade instructions please see: http://manuals.rubyonrails.com/read/book/19" end diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb index f18ea197a5..25b26e9c96 100644 --- a/activesupport/lib/active_support/deprecation.rb +++ b/activesupport/lib/active_support/deprecation.rb @@ -13,7 +13,7 @@ module ActiveSupport $stderr.puts callstack.join("\n ") if debug }, 'development' => Proc.new { |message, callstack| - logger = defined? Rails ? Rails.logger : Logger.new($stderr) + logger = defined?(Rails) ? Rails.logger : Logger.new($stderr) logger.warn message logger.debug callstack.join("\n ") if debug } |