Odoo Addons (MOVED TO GITHUB)

Merge lp:~hbrunn/openobject-addons/6.1_lp1107816 into lp:openobject-addons/6.1

  1. 6.1_lp1107816
  2. Merge into 6.1
Proposed by Holger Brunn (Therp)
Status: Needs review
Proposed branch: lp:~hbrunn/openobject-addons/6.1_lp1107816
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
mail/mail_thread.py (+1/-1)
To merge this branch: bzr merge lp:~hbrunn/openobject-addons/6.1_lp1107816
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+145165@code.launchpad.net
To post a comment you must log in.
lp:~hbrunn/openobject-addons/6.1_lp1107816 updated
7138. By Holger Brunn (Therp)

[FIX] pass empty string to regex if subject is none - do it right

Unmerged revisions

7138. By Holger Brunn (Therp)

[FIX] pass empty string to regex if subject is none - do it right

7137. By Holger Brunn (Therp)

[FIX] pass empty string to regex if subject is none

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py 2012-08-10 11:48:38 +0000
+++ mail/mail_thread.py 2013-01-28 12:21:24 +0000
@@ -358,7 +358,7 @@
358 match = tools.reference_re.search(references)358 match = tools.reference_re.search(references)
359 if match: res_id = match.group(1)359 if match: res_id = match.group(1)
360 if not res_id:360 if not res_id:
361 match = tools.res_re.search(msg['subject'])361 match = tools.res_re.search(msg['subject'] or '')
362 if match: res_id = match.group(1)362 if match: res_id = match.group(1)
363 if res_id:363 if res_id:
364 res_id = int(res_id)364 res_id = int(res_id)