From 905f5118a4756e197161d257abf15d64eb8da359 Mon Sep 17 00:00:00 2001 From: Denis Chenu Date: Mon, 15 May 2023 18:16:44 +0000 Subject: [PATCH] Foixed issue #18787: Wrong default answers are loaded for multilingual surveys (#3106) --- application/helpers/common_helper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php index 3b0e1336aa0..f451b8cb4b7 100644 --- a/application/helpers/common_helper.php +++ b/application/helpers/common_helper.php @@ -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; @@ -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;