Merged r9358 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9376 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-09 06:27:07 +00:00
parent 86ee285eb4
commit 72ecb80dc7
2 changed files with 16 additions and 0 deletions
@@ -54,6 +54,13 @@ class MailHandler < ActionMailer::Base
      end
      return false
    end
+    # Ignore out-of-office emails
+    if email.header_string("X-Auto-Response-Suppress") == 'OOF'
+      if logger && logger.info
+        logger.info  "MailHandler: ignoring out-of-office email"
+      end
+      return false
+    end
    @user = User.find_by_mail(sender_email) if sender_email.present?
    if @user && !@user.active?
      if logger && logger.info