Index: app/models/mail_handler.rb
===================================================================
--- app/models/mail_handler.rb	(revision 17805)
+++ app/models/mail_handler.rb	(working copy)
@@ -54,7 +54,7 @@
   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
 
@@ -74,10 +74,6 @@
     options
   end
 
-  def logger
-    Rails.logger
-  end
-
   cattr_accessor :ignored_emails_headers
   self.ignored_emails_headers = {
     'Auto-Submitted' => /\Aauto-(replied|generated)/,
@@ -92,9 +88,7 @@
     sender_email = email.from.to_a.first.to_s.strip
     # Ignore emails received from the application emission address to avoid hell cycles
     if sender_email.casecmp(Setting.mail_from.to_s.strip) == 0
-      if logger
-        logger.info  "MailHandler: ignoring email from Redmine emission address [#{sender_email}]"
-      end
+      Rails.logger.info  "MailHandler: ignoring email from Redmine emission address [#{sender_email}]"
       return false
     end
     # Ignore auto generated emails
@@ -103,9 +97,7 @@
       if value
         value = value.to_s.downcase
         if (ignored_value.is_a?(Regexp) && value.match(ignored_value)) || value == ignored_value
-          if logger
-            logger.info "MailHandler: ignoring email with #{key}:#{value} header"
-          end
+          Rails.logger.info "MailHandler: ignoring email with #{key}:#{value} header"
           return false
         end
       end
@@ -112,9 +104,7 @@
     end
     @user = User.find_by_mail(sender_email) if sender_email.present?
     if @user && !@user.active?
-      if logger
-        logger.info  "MailHandler: ignoring email from non-active user [#{@user.login}]"
-      end
+      Rails.logger.info  "MailHandler: ignoring email from non-active user [#{@user.login}]"
       return false
     end
     if @user.nil?
@@ -125,24 +115,18 @@
       when 'create'
         @user = create_user_from_email
         if @user
-          if logger
-            logger.info "MailHandler: [#{@user.login}] account created"
-          end
+          Rails.logger.info "MailHandler: [#{@user.login}] account created"
           add_user_to_group(handler_options[:default_group])
           unless handler_options[:no_account_notice]
             ::Mailer.deliver_account_information(@user, @user.password)
           end
         else
-          if logger
-            logger.error "MailHandler: could not create account for [#{sender_email}]"
-          end
+          Rails.logger.error "MailHandler: could not create account for [#{sender_email}]"
           return false
         end
       else
         # Default behaviour, emails from unknown users are ignored
-        if logger
-          logger.info  "MailHandler: ignoring email from unknown user [#{sender_email}]"
-        end
+        Rails.logger.info  "MailHandler: ignoring email from unknown user [#{sender_email}]"
         return false
       end
     end
@@ -176,13 +160,13 @@
     end
   rescue ActiveRecord::RecordInvalid => e
     # TODO: send a email to the user
-    logger.error "MailHandler: #{e.message}" if logger
+    Rails.logger.error "MailHandler: #{e.message}"
     false
   rescue MissingInformation => e
-    logger.error "MailHandler: missing information from #{user}: #{e.message}" if logger
+    Rails.logger.error "MailHandler: missing information from #{user}: #{e.message}"
     false
   rescue UnauthorizedAction => e
-    logger.error "MailHandler: unauthorized attempt from #{user}" if logger
+    Rails.logger.error "MailHandler: unauthorized attempt from #{user}"
     false
   end
 
@@ -220,7 +204,7 @@
     add_watchers(issue)
     issue.save!
     add_attachments(issue)
-    logger.info "MailHandler: issue ##{issue.id} created by #{user}" if logger
+    Rails.logger.info "MailHandler: issue ##{issue.id} created by #{user}"
     issue
   end
 
@@ -252,9 +236,7 @@
     add_watchers(issue)
     issue.save!
     add_attachments(issue)
-    if logger
-      logger.info "MailHandler: issue ##{issue.id} updated by #{user}"
-    end
+    Rails.logger.info "MailHandler: issue ##{issue.id} updated by #{user}"
     journal
   end
 
@@ -285,9 +267,7 @@
         add_attachments(reply)
         reply
       else
-        if logger
-          logger.info "MailHandler: ignoring reply from [#{sender_email}] to a locked topic"
-        end
+        Rails.logger.info "MailHandler: ignoring reply from [#{sender_email}] to a locked topic"
       end
     end
   end
@@ -316,7 +296,7 @@
         regexp = %r{\A#{Regexp.escape(pattern).gsub("\\*", ".*")}\z}i
       end
       if attachment.filename.to_s =~ regexp
-        logger.info "MailHandler: ignoring attachment #{attachment.filename} matching #{pattern}"
+        Rails.logger.info "MailHandler: ignoring attachment #{attachment.filename} matching #{pattern}"
         return false
       end
     end
@@ -549,11 +529,11 @@
       if user.save
         user
       else
-        logger.error "MailHandler: failed to create User: #{user.errors.full_messages}" if logger
+        Rails.logger.error "MailHandler: failed to create User: #{user.errors.full_messages}"
         nil
       end
     else
-      logger.error "MailHandler: failed to create User: no FROM address found" if logger
+      Rails.logger.error "MailHandler: failed to create User: no FROM address found"
       nil
     end
   end
@@ -564,8 +544,8 @@
       default_group.split(',').each do |group_name|
         if group = Group.named(group_name).first
           group.users << @user
-        elsif logger
-          logger.warn "MailHandler: could not add user to [#{group_name}], group not found"
+        else
+          Rails.logger.warn "MailHandler: could not add user to [#{group_name}], group not found"
         end
       end
     end
@@ -579,7 +559,7 @@
       begin
         delimiters = delimiters.map {|s| Regexp.new(s)}
       rescue RegexpError => e
-        logger.error "MailHandler: invalid regexp delimiter found in mail_handler_body_delimiters setting (#{e.message})" if logger
+        logger.error "MailHandler: invalid regexp delimiter found in mail_handler_body_delimiters setting (#{e.message})"
       end
     end