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

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

diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index be4b363b1de3d3590c31be9e817fc97b6e8653ac..4f2c8cc0496af52d0e3ced57bee01d8b2d2e7281 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