Dev Fixed issue with importing subquestion translations.

LimeSurvey · Jul 3, 2015 · 7cc4a78 · 7cc4a78
1 parent b234943
commit 7cc4a78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/application/controllers/QuestionsController.php b/application/controllers/QuestionsController.php
@@ -174,9 +174,13 @@ public function actionDelete($id)
      * @return \Question
      */
     protected function loadModel($id) {
-        return \Question::model()->findByAttributes([
+        $result = \Question::model()->findByAttributes([
             'qid' => $id
         ]);
+        if (!isset($result)) {
+            throw new \CHttpException(404, gT("Question not found."));
+        }
+        return $result;
     }
 }
 
diff --git a/application/helpers/import/BaseElementXmlImport.php b/application/helpers/import/BaseElementXmlImport.php
@@ -75,7 +75,8 @@ protected function constructQuestion($question, $language, $data)
     {
 
         // Add translations.
-        foreach ($data['questions']['rows'] as $translatedQuestion) {
+        $questions = isset($data['subquestions']) ? array_merge($data['subquestions']['rows'], $data['questions']['rows']) : $data['questions']['rows'];
+        foreach ($questions as $translatedQuestion) {
             if ($translatedQuestion['qid'] == $question['qid']
                 && $translatedQuestion['language'] != $language
             ) {
@@ -85,7 +86,7 @@ protected function constructQuestion($question, $language, $data)
 
         // Add subquestions
         foreach (isset($data['subquestions']) ? $data['subquestions']['rows'] : [] as $subQuestion) {
-            if ($subQuestion['parent_qid'] == $question['qid']) {
+            if ($subQuestion['parent_qid'] == $question['qid'] && $subQuestion['language'] == $language) {
                 $question['subquestions'][] = $this->constructQuestion($subQuestion, $language, $data);
             }
         }