Fixed issue: Replacing @@SURVEYURL@@ incorrectly in RPC (#630)

LimeSurvey · Feb 3, 2017 · c760cd7 · c760cd7
1 parent b9332f6
commit c760cd7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/application/helpers/admin/token_helper.php b/application/helpers/admin/token_helper.php
@@ -131,12 +131,12 @@ function emailTokens($iSurveyID,$aResultTokens,$sType)
 
 		if (isset($barebone_link))
 		{
-			$modsubject = str_replace("@@SURVEYURL@@", $barebone_link, $modsubject);
-			$modmessage = str_replace("@@SURVEYURL@@", $barebone_link, $modmessage);
+			$modsubject = str_replace("@@SURVEYURL@@", $barebone_link, $sSubject);
+			$modmessage = str_replace("@@SURVEYURL@@", $barebone_link, $sMessage);
 		}
-		
-		$modsubject = Replacefields($sSubject, $fieldsarray);
-		$modmessage = Replacefields($sMessage, $fieldsarray);
+
+		$modsubject = Replacefields($modsubject, $fieldsarray);
+		$modmessage = Replacefields($modmessage, $fieldsarray);
 
 		if (isset($aTokenRow['validfrom']) && trim($aTokenRow['validfrom']) != '' && convertDateTimeFormat($aTokenRow['validfrom'], 'Y-m-d H:i:s', 'U') * 1 > date('U') * 1)
 		{