Changeset 5717

Timestamp:

12/04/09 16:24:36 (2 years ago)

Author:

CrawfordCurrie

Message:

Item8354: Martin Rowe fixed a problem with STARTPUBLISH in newsletters corrupting the template

Location:

trunk/MailerContrib

Files:

• data/System/MailerContrib.txt (modified) (1 diff)
• lib/Foswiki/Contrib/MailerContrib.pm (modified) (3 diffs)

trunk/MailerContrib/data/System/MailerContrib.txt

@@ -231 +231 @@
 |  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 |

trunk/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm

@@ -27 +27 @@
 
 our $VERSION = '$Rev$';
-our $RELEASE = '17 Oct 2009';
+our $RELEASE = '4 Dec 2009';
 our $SHORTDESCRIPTION = 'Supports e-mail notification of changes';
 
@@ -490 +490 @@
     $tmpl = Foswiki::Func::expandCommonVariables( $tmpl, $topic, $web );
     $tmpl = Foswiki::Func::renderText( $tmpl, "", $meta );
-    $tmpl = "$header$tmpl";
 
     # REFACTOR OPPORTUNITY: stop factor me into getTWikiRendering()
@@ -513 +512 @@
         }
     }
-    $tmpl = $newTmpl;
+    $tmpl = $header . $newTmpl;
     $tmpl =~ s/.*?<\/nopublish>//gs;
     $tmpl =~ s/%MAXREV%/$maxrev/g;