Merge branch 'master' of github.com:LimeSurvey/LimeSurvey

LimeSurvey · Nov 18, 2015 · d0489fd · d0489fd
2 parents 307f380 + 435ab56
commit d0489fd
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
@@ -81,6 +81,8 @@ function emailTokens($iSurveyID,$aResultTokens,$sType)
 		$from = $fieldsarray["{ADMINNAME}"] . ' <' . $fieldsarray["{ADMINEMAIL}"] . '>';
 		if($from ==  '')
 			$from = Yii::app()->getConfig('siteadminemail');
+		elseif (!empty($fieldsarray["{ADMINNAME}"]))
+                        $from = $fieldsarray["{ADMINNAME}"]." <".$from.">";
 
 		foreach ($attributes as $attributefield)
 		{