lack name of the sender in the field from when using JSON-PRC

LimeSurvey · May 21, 2015 · 02ef42c · 02ef42c
1 parent e9fa25c
commit 02ef42c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/application/helpers/admin/token_helper.php b/application/helpers/admin/token_helper.php
@@ -165,6 +165,8 @@ function emailTokens($iSurveyID,$aResultTokens,$sType)
 		$from =  $fieldsarray["{ADMINEMAIL}"];
 		if($from ==  '')
 			$from = Yii::app()->getConfig('siteadminemail');
+		elseif (!empty($fieldsarray["{ADMINNAME}"]))
+                        $from = $fieldsarray["{ADMINNAME}"]." <".$from.">";
 
 		foreach ($attributes as $attributefield)
 		{