[Pgp-tools-commit] r778 - trunk/caff

[Guilhem Moulin]

Author: guilhem-guest
Date: 2015-02-20 19:36:08 +0000 (Fri, 20 Feb 2015)
New Revision: 778

Modified:
   trunk/caff/caff
Log:
wibble

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2015-02-20 19:36:03 UTC (rev 777)
+++ trunk/caff/caff	2015-02-20 19:36:08 UTC (rev 778)
@@ -607,10 +607,7 @@
 	$CONFIG{'mailer-send'} //= [];
 	myerror(1, "$0: mailer-send is not an array ref in $config.") unless ref $CONFIG{'mailer-send'} eq 'ARRAY';
 	$CONFIG{'mail-subject'} //= "Your signed PGP key 0x%k";
-
-	unless (defined $CONFIG{'mail-template'}) {
-		$CONFIG{'mail-template'} .= $_ foreach <DATA>;
-	}
+	$CONFIG{'mail-template'} //= do { local $/; <DATA> };
 	$CONFIG{'also-encrypt-to'} = [ $CONFIG{'also-encrypt-to'} ]
 		if defined $CONFIG{'also-encrypt-to'} and !ref $CONFIG{'also-encrypt-to'};
 	if (defined $LOCALE) {