From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Thu, 25 Mar 2004 22:53:26 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9067b61558f02db42745a2e9a72e2bc39f52c701;p=roundup.git

*** empty log message ***


git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@2192 57a73879-2fb5-44c3-a270-3262357dd7e2
---

diff --git a/TODO.txt b/TODO.txt
index 47a810c..3d6ae74 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,5 +1,4 @@
-This file has been re-purposed to contain specifically the items that need
-doing before the next release:
+This file contains items that need doing before the next release:
 
 - ensure index creation is triggered by the version 1->2 update
   (and other upgrade tests)
diff --git a/roundup/mailer.py b/roundup/mailer.py
index e3f4f75..0ddabe9 100644
--- a/roundup/mailer.py
+++ b/roundup/mailer.py
@@ -1,7 +1,7 @@
 """Sending Roundup-specific mail over SMTP.
 """
 __docformat__ = 'restructuredtext'
-# $Id: mailer.py,v 1.8 2004-03-25 22:52:12 richard Exp $
+# $Id: mailer.py,v 1.9 2004-03-25 22:53:26 richard Exp $
 
 import time, quopri, os, socket, smtplib, re
 
@@ -99,8 +99,6 @@ class Mailer:
         - subject: the subject as a string.
 
         """
-        message, writer = self.get_standard_message(to, subject)
-
         # see whether we should send to the dispatcher or not
         dispatcher_email = getattr(self.config, "DISPATCHER_EMAIL",
             getattr(self.config, "ADMIN_EMAIL"))
@@ -110,6 +108,8 @@ class Mailer:
         elif error_messages_to == "both":
             to.append(dispatcher_email)
 
+        message, writer = self.get_standard_message(to, subject)
+
         part = writer.startmultipartbody('mixed')
         part = writer.nextpart()
         part.addheader('Content-Transfer-Encoding', 'quoted-printable')