Item8354: Martin Rowe fixed a problem with STARTPUBLISH in newsletter…

…s corrupting the template

git-svn-id: http://svn.foswiki.org/trunk@5717 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

MailerContrib/data/System/MailerContrib.txt

@@ -230,6 +230,7 @@ Many thanks to the following sponsors for supporting this work:
 |  Version: | %$VERSION% |
 |  Release: | %$RELEASE% |
 |  Change History: | |
+|  4 Dec 2009 | Foswikitask:Item8354: Martin Rowe fixed a problem with STARTPUBLISH in newsletters corrupting the template |
 |  17 Oct 2009 | Foswikitask:Item1302: Removed the documentation of the -news mode which was actually never really implemented. Instead added two new -nonews and -nochanges modes which enables running mailnotify in newsletter mode with another schedule than the changes mode. If you upgrade and used the -news option with mailnotify things will work like you are used to as the -news option made no difference (old bug). |
 |  15 Oct 2009 | Foswikitask:Item2260: Make the feature that allows defining the email template based in either skin or web path. And improve the documentation so people can learn how to tailor the emails that the WebNotify feature sends. <br /> Foswikitask:Item1603: use quotes to protect topic names with odd characters in them |
 |  20 Sep 2009 | Small documentation update for Foswiki 1.0.7 release (RELEASE and adding parent) |

MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm

@@ -26,7 +26,7 @@ use Foswiki::Contrib::MailerContrib::Change    ();
 use Foswiki::Contrib::MailerContrib::UpData    ();
 
 our $VERSION = '$Rev$';
-our $RELEASE = '17 Oct 2009';
+our $RELEASE = '4 Dec 2009';
 our $SHORTDESCRIPTION = 'Supports e-mail notification of changes';
 
 our $verbose = 0;
@@ -489,7 +489,6 @@ sub _sendNewsletterMail {
     my $tmpl = "$body\n$footer";
     $tmpl = Foswiki::Func::expandCommonVariables( $tmpl, $topic, $web );
     $tmpl = Foswiki::Func::renderText( $tmpl, "", $meta );
-    $tmpl = "$header$tmpl";
 
     # REFACTOR OPPORTUNITY: stop factor me into getTWikiRendering()
     # SMELL: this code is identical to PublishContrib!
@@ -512,7 +511,7 @@ sub _sendNewsletterMail {
             $newTmpl .= $s;
         }
     }
-    $tmpl = $newTmpl;
+    $tmpl = $header . $newTmpl;
     $tmpl =~ s/.*?<\/nopublish>//gs;
     $tmpl =~ s/%MAXREV%/$maxrev/g;
     $tmpl =~ s/%CURRREV%/$maxrev/g;