Dev: Fix saving dual scale subquestions

LimeSurvey · Jun 5, 2018 · e6182d1 · e6182d1
1 parent c3a97d2
commit e6182d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php
@@ -708,13 +708,10 @@ public function _editsubquestion($surveyid, $gid, $qid)
             // Check that there are subquestions translations for every language supported by the survey
             foreach ($subquestiondata as $row) {
                 foreach ($aSurveyLanguages as $language) {
-                    $qrow = QuestionL10n::model()->count('
-                        qid = :qid AND
-                        language = :$language',
-                        array(
-                            ':qid' => $qid,
-                            ':language' => $language
-                    ));
+                    $qrow = QuestionL10n::model()->count(
+                        'qid = :qid',
+                        [':qid' => $qid]
+                    );
                     // Means that no record for the language exists in the questions table
                     if (empty($qrow)) {
                         $oQuestionL10n = new QuestionL10n;

diff --git a/application/views/admin/survey/Question/answerOptionsEdit_view.twig b/application/views/admin/survey/Question/answerOptionsEdit_view.twig
@@ -132,9 +132,9 @@
                                                     'surveyid'  : surveyid,
                                                     'gid'       : gid,
                                                     'qid'       : row.qid,
-                                                    'language'  : row.language,
+                                                    'language'  : anslang,
                                                     'title'     : row.title,
-                                                    'question'  : row.question,
+                                                    'question'  : row.questionL10ns[anslang].question,
                                                     'relevance' : row.relevance,
                                                     'oldCode'   : true,
                                                 } %}