Skip to content

Commit 2dd1f0d

Browse files
committed
Improved the resilience of the formatted_email nomcom filter. Fixes ietf-tools#1764. Commit ready for merge.
- Legacy-Id: 14506
1 parent c8b4510 commit 2dd1f0d

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

ietf/nomcom/templatetags/nomcom_tags.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import os
22
import tempfile
3+
import re
34

45
from django import template
56
from django.conf import settings
@@ -38,11 +39,16 @@ def lookup(container,key):
3839
@register.filter
3940
def formatted_email(address):
4041
person = None
41-
if address:
42-
persons = Person.objects.filter(email__address__in=[address])
42+
addrmatch = re.search('<([^>]+)>',address)
43+
if addrmatch:
44+
addr = addrmatch.group(1)
45+
else:
46+
addr = address
47+
if addr:
48+
persons = Person.objects.filter(email__address__in=[addr])
4349
person = persons and persons[0] or None
4450
if person and person.name:
45-
return formataddr((person.plain_name(), address))
51+
return formataddr((person.plain_name(), addr))
4652
else:
4753
return address
4854

0 commit comments

Comments
 (0)