Ignore:
Timestamp:
30 Jan 2014, 14:13:41 (11 years ago)
Author:
Henrik Bettermann
Message:

Merge with changes made in trunk till r10944.

Location:
main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa

    • Property svn:mergeinfo set to (toggle deleted branches)
      /main/waeup.kofa/trunk/src/waeup/kofamergedeligible
      /main/waeup.kofa/branches/uli-autoinclude-less/src/waeup/kofa8871-8888
      /main/waeup.sirp/branches/uli-studentpw/src/waeup/kofa6703-6755
      /main/waeup.sirp/branches/ulif-extimgstore/src/waeup/kofa7001-7062
      /main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/kofa7761-7794

  • main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/smtp.py

    r10855 r11012  
    164164
    165165    mailer = getUtility(IMailService)
    166     rcpt_addrs += [from_addr]
     166    try:
     167        email_admin = grok.getSite()['configuration'].email_admin
     168        if from_addr != email_admin:
     169            rcpt_addrs += [from_addr]
     170    except TypeError:
     171        # In tests we might not have a site object
     172        rcpt_addrs += [from_addr]
     173        pass
    167174    result = mailer().send(from_addr, rcpt_addrs, body.as_string())
    168175    return result
Note: See TracChangeset for help on using the changeset viewer.