holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-26 09:53:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #680 from auto-mat/email-fix

Browse Source 
Don't crash when mail body is empty
This commit is contained in:
Garret Wassermann 2018-12-20 21:25:23 -05:00 committed by GitHub
commit eee82015f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 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: