#13787 issue -- and general core repair

pbdavidn · perlDreamer · commit ff28ef9dc1f3 · 2012-02-24T22:22:36.000-08:00
diff --git a/lib/WebGUI/Mail/Send.pm b/lib/WebGUI/Mail/Send.pm
@@ -343,7 +343,14 @@ sub create {
 			}	
 		}
 	}
-    my $from    = $headers->{from}        || $session->setting->get('companyName') . " <".$session->setting->get("companyEmail").">";
+    my $from    = $headers->{from};
+    $from ||= do {
+        my $CoNa = $session->setting->get('companyName');
+        my $CoEm = $session->setting->get("companyEmail");
+        $CoNa =~ s/"//g;
+        qq{"$CoNa" <$CoEm>}
+    };
+
 	my $type    = $headers->{contentType} || "multipart/mixed";
     my $replyTo = $headers->{replyTo}     || $session->setting->get("mailReturnPath");
 

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,14 @@ sub create {`
`343`	`343`	`}`
`344`	`344`	`}`
`345`	`345`	`}`
`346`		`- my $from = $headers->{from} \|\| $session->setting->get('companyName') . " <".$session->setting->get("companyEmail").">";`
	`346`	`+ my $from = $headers->{from};`
	`347`	`+ $from \|\|= do {`
	`348`	`+ my $CoNa = $session->setting->get('companyName');`
	`349`	`+ my $CoEm = $session->setting->get("companyEmail");`
	`350`	`+ $CoNa =~ s/"//g;`
	`351`	`+ qq{"$CoNa" <$CoEm>}`
	`352`	`+ };`
	`353`	`+`
`347`	`354`	`my $type = $headers->{contentType} \|\| "multipart/mixed";`
`348`	`355`	`my $replyTo = $headers->{replyTo} \|\| $session->setting->get("mailReturnPath");`
`349`	`356`