Skip to content

Commit

Permalink
Fixed issue #06013: passthru stopped working
Browse files Browse the repository at this point in the history
  • Loading branch information
TMSWhite committed Apr 13, 2012
1 parent c604fa6 commit 3dc5adb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion common_functions.php
Expand Up @@ -6357,7 +6357,7 @@ function getQuotaInformation($surveyid,$language,$quotaid='all')
'Limit' => $survey_quotas['qlimit'],
'Action' => $survey_quotas['action'],
'Message' => $survey_quotas['quotals_message'],
'Url' => passthruReplace(insertansReplace($survey_quotas['quotals_url']), $surveyinfo),
'Url' => templatereplace(passthruReplace($survey_quotas['quotals_url']), $surveyinfo),
'UrlDescrip' => $survey_quotas['quotals_urldescrip'],
'AutoloadUrl' => $survey_quotas['autoload_url']));
$query = "SELECT * FROM ".db_table_name('quota_members')." WHERE quota_id='{$survey_quotas['id']}'";
Expand Down
2 changes: 1 addition & 1 deletion group.php
Expand Up @@ -362,8 +362,8 @@

//Before doing the "templatereplace()" function, check the $thissurvey['url']
//field for limereplace stuff, and do transformations!
$thissurvey['surveyls_url']=templatereplace($thissurvey['surveyls_url']); // to do INSERTANS substitutions
$thissurvey['surveyls_url']=passthruReplace($thissurvey['surveyls_url'], $thissurvey);
$thissurvey['surveyls_url']=templatereplace($thissurvey['surveyls_url']); // to do INSERTANS substitutions

$content='';
$content .= templatereplace(file_get_contents("$thistpl/startpage.pstpl"));
Expand Down
2 changes: 2 additions & 0 deletions replacements.php
Expand Up @@ -669,6 +669,8 @@ function templatereplace($line, $replacements=array(), $anonymized=false, $quest
$coreReplacements['NAVIGATOR'] = $navigator; // global
$coreReplacements['NOSURVEYID'] = $surveylist['nosid']; // global
$coreReplacements['NUMBEROFQUESTIONS'] = $_totalquestionsAsked;
$coreReplacements['PASSTHRULABEL'] = '';
$coreReplacements['PASSTHRUVALUE'] = '';
$coreReplacements['PERCENTCOMPLETE'] = $percentcomplete; // global
$coreReplacements['PRIVACY'] = $privacy; // global
$coreReplacements['PRIVACYMESSAGE'] = "<span style='font-weight:bold; font-style: italic;'>".$clang->gT("A Note On Privacy")."</span><br />".$clang->gT("This survey is anonymous.")."<br />".$clang->gT("The record kept of your survey responses does not contain any identifying information about you unless a specific question in the survey has asked for this. If you have responded to a survey that used an identifying token to allow you to access the survey, you can rest assured that the identifying token is not kept with your responses. It is managed in a separate database, and will only be updated to indicate that you have (or haven't) completed this survey. There is no way of matching identification tokens with survey responses in this survey.");
Expand Down

1 comment on commit 3dc5adb

@TMSWhite
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ported to Yii

Please sign in to comment.