diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-09 06:27:07 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-09 06:27:07 +0000 |
| commit | 72ecb80dc755422182753ab8d976fd8c4ac07f57 (patch) | |
| tree | f1dfcc17324a4a799adcb9f74a9c5721fb09cbf2 /app/models | |
| parent | 86ee285eb43bf0b927beebfa57714bf277f0ac8e (diff) | |
| download | redmine-72ecb80dc755422182753ab8d976fd8c4ac07f57.tar.gz redmine-72ecb80dc755422182753ab8d976fd8c4ac07f57.zip | |
Merged r9358 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9376 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/mail_handler.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index 2d50a8057..e0c12f1a0 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -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 |