dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #1583, thanks matclab

Browse Source
This commit is contained in:
mdipierro
2017-06-20 14:24:35 -05:00
parent 2174fc3bec
commit 18b755b8da
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/packages/dal
+1 -1
Submodule gluon/packages/dal updated: c11676867c...38066734f7
gluon/tools.py
+3 -3
View File
@@ -776,16 +776,16 @@ class Mail(object):
if attachments: if attachments:
result = mail.send_mail( result = mail.send_mail(
sender=sender, to=origTo, sender=sender, to=origTo,
subject=to_unicode(subject, encoding), body=to_unicode(text, encoding), html=html, subject=to_unicode(subject, encoding), body=to_unicode(text or '', encoding), html=html,
attachments=attachments, **xcc) attachments=attachments, **xcc)
elif html and (not raw): elif html and (not raw):
result = mail.send_mail( result = mail.send_mail(
sender=sender, to=origTo, sender=sender, to=origTo,
subject=to_unicode(subject, encoding), body=to_unicode(text, encoding), html=html, **xcc) subject=to_unicode(subject, encoding), body=to_unicode(text or '', encoding), html=html, **xcc)
else: else:
result = mail.send_mail( result = mail.send_mail(
sender=sender, to=origTo, sender=sender, to=origTo,
subject=to_unicode(subject, encoding), body=to_unicode(text, encoding), **xcc) subject=to_unicode(subject, encoding), body=to_unicode(text or '', encoding), **xcc)
else: else:
smtp_args = self.settings.server.split(':') smtp_args = self.settings.server.split(':')
kwargs = dict(timeout=self.settings.timeout) kwargs = dict(timeout=self.settings.timeout)