summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Ledoux <dle@openerp.com>2013-10-08 13:18:45 +0200
committerDenis Ledoux <dle@openerp.com>2013-10-08 13:18:45 +0200
commitd32c663fbece0d4c4e77ecdd9bf66c409ed917ad (patch)
tree7edab71fbed5b528912ea4ac885e3f643614ae84
parent447e547c13b3c2862343b9107167c90e248fd361 (diff)
[FIX]mail: mail_thread, trying to send a message in the chatter while the emails where all mal-formed raised an error.
bzr revid: dle@openerp.com-20131008111845-tx3bpp8snfl03cnk
-rw-r--r--addons/mail/mail_thread.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index b6754c27ef2..87c02dcf329 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -885,9 +885,9 @@ class mail_thread(osv.AbstractModel):
partner_id, partner_name<partner_email> or partner_name, reason """
if email and not partner:
# get partner info from email
- partner_info = self.message_get_partner_info_from_emails(cr, uid, [email], context=context, res_id=obj.id)[0]
- if partner_info.get('partner_id'):
- partner = self.pool.get('res.partner').browse(cr, SUPERUSER_ID, [partner_info.get('partner_id')], context=context)[0]
+ partner_info = self.message_get_partner_info_from_emails(cr, uid, [email], context=context, res_id=obj.id)
+ if partner_info and partner_info[0].get('partner_id'):
+ partner = self.pool.get('res.partner').browse(cr, SUPERUSER_ID, [partner_info[0]['partner_id']], context=context)[0]
if email and email in [val[1] for val in result[obj.id]]: # already existing email -> skip
return result
if partner and partner in obj.message_follower_ids: # recipient already in the followers -> skip