Author: adsb
Date: 2009-06-15 17:19:46 +0000 (Mon, 15 Jun 2009)
New Revision: 1907

Modified:
   trunk/scripts/bts.pl
Log:
Pass both the header and message body back from confirmmail()

Modified: trunk/scripts/bts.pl
===================================================================
--- trunk/scripts/bts.pl        2009-06-15 16:37:10 UTC (rev 1906)
+++ trunk/scripts/bts.pl        2009-06-15 17:19:46 UTC (rev 1907)
@@ -2206,7 +2206,7 @@
                .  "\n";
 
     $body = addfooter($body);
-    $body = confirmmail($message, $body);
+    ($message, $body) = confirmmail($message, $body);
 
     return if not defined $body;
 
@@ -2348,7 +2348,7 @@
                  .  "\n";
 
        $body = addfooter($body);
-       $body = confirmmail($header, $body);
+       ($header, $body) = confirmmail($header, $body);
 
        return if not defined $body;
 
@@ -2391,7 +2391,7 @@
 sub confirmmail {
     my ($header, $body) = @_;
 
-    return $body if $noaction;
+    return ($header, $body) if $noaction;
 
     $body = edit($body) if $forceinteractive;
     my $setHeader = 0;
@@ -2425,7 +2425,7 @@
        }
     }
 
-    return $body;
+    return ($header, $body);
 }
 
 sub addfooter() {



-- 
To unsubscribe, send mail to [email protected].

Reply via email to