Changeset 11161 for main/waeup.kofa/branches/0.2/src/waeup/kofa/smtp.py

Timestamp:

21 Feb 2014, 11:07:54 (11 years ago)

Author:

uli

Message:

Merge current trunk into 0.2 maintenance branch. Now really

Location:

main/waeup.kofa/branches/0.2

Files:

• . (modified) (1 prop)
• src/waeup/kofa/smtp.py (modified) (1 diff)

main/waeup.kofa/branches/0.2/src/waeup/kofa/smtp.py

@@ -164 +164 @@
 
     mailer = getUtility(IMailService)
-    rcpt_addrs += [from_addr]
+    try:
+        email_admin = grok.getSite()['configuration'].email_admin
+        if from_addr != email_admin:
+            rcpt_addrs += [from_addr]
+    except TypeError:
+        # In tests we might not have a site object
+        rcpt_addrs += [from_addr]
+        pass
     result = mailer().send(from_addr, rcpt_addrs, body.as_string())
     return result