2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

Updated limesurvey to revision 11019

This commit is contained in:
azammitdcarf
2011-09-20 23:28:02 +00:00
parent f018ac95c9
commit 4abd0c59ac
20 changed files with 12661 additions and 13136 deletions

View File

@@ -136,7 +136,7 @@ if(isset($showsgqacode) && $showsgqacode == true)
}
else
{
$surveyname = "";
$surveyname = $surveyname;
}
$survey_output = array(
@@ -442,7 +442,7 @@ while ($degrow = $degresult->FetchRow())
FROM ".db_table_name("conditions")."
WHERE ".db_table_name("conditions").".qid={$deqrow['qid']}
AND ".db_table_name("conditions").".scenario={$scenariorow['scenario']}
group by cqid, method, cfieldname, value
group by cqid, method
ORDER BY cqid";
$distinctresult=db_execute_assoc($distinctquery);
//Loop through each condition for a particular scenario.
@@ -493,7 +493,7 @@ while ($degrow = $degresult->FetchRow())
{
$explanation .= $clang->gT("Answer was")." ";
}
$explanation .= " ".$distinctrow['value'];
$explanation .= " `".$distinctrow['value']."`";
}
if(!$distinctrow['cqid']) { // cqid == 0 ==> token attribute match
$tokenData = GetTokenFieldsAndNames($surveyid);
@@ -531,7 +531,7 @@ while ($degrow = $degresult->FetchRow())
{
$explanation .= $clang->gT("is")." ";
}
$answer_section = $distinctrow['value'];
$explanation .= " `".$distinctrow['value']."`";
}
$conquery="SELECT cid, cqid, q.title,\n"