Merge remote-tracking branch 'origin/master'

LimeSurvey · Nov 30, 2012 · 6d89157 · 6d89157
2 parents ea5b4cf + 92d8c27
commit 6d89157
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
@@ -124,7 +124,9 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     }
     if(!isset($templatedir)) $templatedir = getTemplatePath($templatename);
     if(!isset($templateurl)) $templateurl = getTemplateURL($templatename)."/";
-
+    if (!$anonymized && isset($thissurvey['anonymized'])) {
+        $anonymized=($thissurvey['anonymized']=="Y");
+    }
     // TEMPLATECSS and TEMPLATEJS
     $_templatecss="";$_templatejs="";
     if(stripos ($line,"{TEMPLATECSS}"))
@@ -859,7 +861,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     $coreReplacements['TEMPLATEJS'] = $_templatejs;
     $coreReplacements['TEMPLATEURL'] = $templateurl;
     $coreReplacements['THEREAREXQUESTIONS'] = $_therearexquestions;
-    if (!$anonymized) $coreReplacements['TOKEN'] = $_token;
+    $coreReplacements['TOKEN'] = (!$anonymized ? $_token : '');// Silently replace TOKEN by empty string
     $coreReplacements['URL'] = $_linkreplace;
     $coreReplacements['WELCOME'] = (isset($thissurvey['welcome']) ? $thissurvey['welcome'] : '');