extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2024-12-13 18:31:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into bootstrap4

Browse Source
This commit is contained in:
Garret Wassermann 2018-12-20 21:55:24 -05:00
commit 5940b706c1
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
helpdesk/email.py
View File

@ -362,11 +362,13 @@ def ticket_from_message(message, queue, logger):
if not body:
mail = BeautifulSoup(part.get_payload(), "lxml")
if ">" in mail.text:
body = mail.find('body')
body = body.text
body = body.encode('ascii', errors='ignore')
else:
beautiful_body = mail.find('body')
if beautiful_body:
try:
body = beautiful_body.text
except AttributeError:
pass
if not body:
body = mail.text
if ticket: