diff lib/redmine/pop3.rb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch
author Chris Cannam
date Mon, 07 Jan 2013 12:01:42 +0000
parents cbb26bc654de
children 622f24f53b42
line wrap: on
line diff
--- a/lib/redmine/pop3.rb	Wed Jun 27 14:54:18 2012 +0100
+++ b/lib/redmine/pop3.rb	Mon Jan 07 12:01:42 2013 +0000
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2011  Jean-Philippe Lang
+# Copyright (C) 2006-2012  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -35,7 +35,7 @@
             logger.debug "#{pop_session.mails.size} email(s) to process..." if logger && logger.debug?
             pop_session.each_mail do |msg|
               message = msg.pop
-              message_id = (message =~ /^Message-ID: (.*)/ ? $1 : '').strip
+              message_id = (message =~ /^Message-I[dD]: (.*)/ ? $1 : '').strip
               if MailHandler.receive(message, options)
                 msg.delete
                 logger.debug "--> Message #{message_id} processed and deleted from the server" if logger && logger.debug?
@@ -55,7 +55,7 @@
       private
 
       def logger
-        RAILS_DEFAULT_LOGGER
+        ::Rails.logger
       end
     end
   end