Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Foixed issue #18787: Wrong default answers are loaded for multilingua…
…l surveys (#3106)
  • Loading branch information
Shnoulle committed May 15, 2023
1 parent 6c9cc79 commit 905f511
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions application/helpers/common_helper.php
Expand Up @@ -1414,8 +1414,8 @@ function createFieldMap($survey, $style = 'short', $force_refresh = false, $ques

$defaultsQuery = "SELECT a.qid, a.sqid, a.scale_id, a.specialtype, al10.defaultvalue"
. " FROM {{defaultvalues}} as a "
. " LEFT JOIN {{defaultvalue_l10ns}} as al10 ON a.dvid = al10.dvid "
. " LEFT JOIN {{questions}} as b ON a.qid = b.qid "
. " JOIN {{defaultvalue_l10ns}} as al10 ON a.dvid = al10.dvid " // We NEED a default value set
. " JOIN {{questions}} as b ON a.qid = b.qid " // We NEED only question in this survey
. " AND al10.language = '{$sLanguage}'"
. " AND b.same_default=0"
. " AND b.sid = " . $surveyid;
Expand All @@ -1435,8 +1435,8 @@ function createFieldMap($survey, $style = 'short', $force_refresh = false, $ques
$baseLanguage = $survey->language;
$defaultsQuery = "SELECT a.qid, a.sqid, a.scale_id, a.specialtype, al10.defaultvalue"
. " FROM {{defaultvalues}} as a "
. " LEFT JOIN {{defaultvalue_l10ns}} as al10 ON a.dvid = al10.dvid "
. " LEFT JOIN {{questions}} as b ON a.qid = b.qid "
. " JOIN {{defaultvalue_l10ns}} as al10 ON a.dvid = al10.dvid " // We NEED a default value set
. " JOIN {{questions}} as b ON a.qid = b.qid " // We NEED only question in this survey
. " AND al10.language = '{$baseLanguage}'"
. " AND b.same_default=1"
. " AND b.sid = " . $surveyid;
Expand Down

0 comments on commit 905f511

Please sign in to comment.