From 168b5909294e02bac7d37ae044543b3aad5cd645 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 18 Dec 2012 17:37:15 +0100 Subject: [PATCH] [FIX] mail.thread.route: ignore missing In-Reply-Tos bzr revid: stw@openerp.com-20121218163715-8l0qk8fhrg23d4er --- addons/mail/mail_thread.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index fc2a5547bd2..541b4dcfd58 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -327,13 +327,14 @@ class mail_thread(osv.AbstractModel): message_id, model, thread_id, custom_values, uid) return [(model, thread_id, custom_values, uid)] - # Verify this is a reply to a private message - message_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', in_reply_to)], limit=1, context=context) - if message_ids: - message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context) - _logger.debug('Routing mail with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s', - message_id, message.id, custom_values, uid) - return [(message.model, message.res_id, custom_values, uid)] + # Verify whether this is a reply to a private message + if in_reply_to: + message_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', in_reply_to)], limit=1, context=context) + if message_ids: + message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context) + _logger.debug('Routing mail with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s', + message_id, message.id, custom_values, uid) + return [(message.model, message.res_id, custom_values, uid)] # 2. Look for a matching mail.alias entry # Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values