Fixed issue #4531: @@SURVEYURL@@ tag does not get replaced in reminde…

…r emails git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@9064 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Aug 16, 2010 · d09325e · d09325e
1 parent dd4c899
commit d09325e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/admin/tokens.php b/admin/tokens.php
@@ -1717,10 +1717,12 @@
                     if ( $modrewrite )
                     {
                         $fieldsarray["{SURVEYURL}"]="<a href='$publicurl/$surveyid/lang-".trim($emrow['language'])."/tk-{$emrow['token']}'>".htmlspecialchars("$publicurl/$surveyid/lang-".trim($emrow['language'])."/tk-{$emrow['token']}")."</a>";
+                        $fieldsarray["@@SURVEYURL@@"]="$publicurl/$surveyid/lang-".trim($emrow['language'])."/tk-{$emrow['token']}";
                     }
                     else
                     {
                         $fieldsarray["{SURVEYURL}"]="<a href='$publicurl/index.php?lang=".trim($emrow['language'])."&sid=$surveyid&token={$emrow['token']}'>".htmlspecialchars("$publicurl/index.php?lang=".trim($emrow['language'])."&sid=$surveyid&token={$emrow['token']}")."</a>";
+                        $fieldsarray["@@SURVEYURL@@"]="$publicurl/index.php?lang=".trim($emrow['language'])."&amp;sid=$surveyid&amp;token={$emrow['token']}";
                         $_POST['message_'.$emrow['language']] = html_entity_decode($_POST['message_'.$emrow['language']], ENT_QUOTES, $emailcharset);
                     }
                 }