Merged r18066 from trunk to 3.4-stable (#30457).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18068 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index aa0ea1e4599f7cf35e9c4d9d406079628c9c8a48..5590534d9ecc25571b079c62cd1125b711dbf968 100755 (executable)
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -54,7 +54,7 @@ class MailHandler < ActionMailer::Base
   def self.safe_receive(*args)
     receive(*args)
   rescue Exception => e
-    logger.error "MailHandler: an unexpected error occurred when receiving email: #{e.message}" if logger
+    Rails.logger.error "MailHandler: an unexpected error occurred when receiving email: #{e.message}"
     return false
   end