Remove e-mail from/to patches as those are integration in base CKAN 2.9.9

This commit is contained in:
b-a0 2023-06-13 13:23:53 +02:00
parent 7557faec86
commit a3ef5702fb
2 changed files with 0 additions and 22 deletions

View File

@ -1,11 +0,0 @@
--- ckan/ckan/lib/mailer.py
+++ ckan/ckan/lib/mailer.py
@@ -55,7 +55,7 @@ def _mail_recipient(recipient_name, recipient_email,
msg.add_header(k, v)
subject = Header(subject.encode('utf-8'), 'utf-8')
msg['Subject'] = subject
- msg['From'] = _("%s <%s>") % (sender_name, mail_from)
+ msg['From'] = utils.formataddr((sender_name, mail_from))
msg['To'] = u"%s <%s>" % (recipient_name, recipient_email)
msg['Date'] = utils.formatdate(time())
msg['X-Mailer'] = "CKAN %s" % ckan.__version__

View File

@ -1,11 +0,0 @@
--- ckan/ckan/lib/mailer.py
+++ ckan/ckan/lib/mailer.py
@@ -56,7 +56,7 @@ def _mail_recipient(recipient_name, recipient_email,
subject = Header(subject.encode('utf-8'), 'utf-8')
msg['Subject'] = subject
msg['From'] = utils.formataddr((sender_name, mail_from))
- msg['To'] = u"%s <%s>" % (recipient_name, recipient_email)
+ msg['To'] = utils.formataddr((recipient_name, recipient_email))
msg['Date'] = utils.formatdate(time())
msg['X-Mailer'] = "CKAN %s" % ckan.__version__
# Check if extension is setting reply-to via headers or use config option