Fix #09783: Use "adminname <adminemail>" as from-header in emailTokens

LimeSurvey · Jul 20, 2015 · 08447cf · 08447cf
1 parent 14ce4be
commit 08447cf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/application/helpers/admin/token_helper.php b/application/helpers/admin/token_helper.php
@@ -78,7 +78,7 @@ function emailTokens($iSurveyID,$aResultTokens,$sType)
 
 		$fieldsarray["{ADMINNAME}"] = $oSurvey['admin'];
 		$fieldsarray["{ADMINEMAIL}"] = $oSurvey['adminemail'];
-		$from =  $fieldsarray["{ADMINEMAIL}"];
+		$from = $fieldsarray["{ADMINNAME}"] . ' <' . $fieldsarray["{ADMINEMAIL}"] . '>';
 		if($from ==  '')
 			$from = Yii::app()->getConfig('siteadminemail');