[fix] Issue with relevance on X scale with multilingual

LimeSurvey · Mar 20, 2016 · f02cd40 · f02cd40
1 parent 9a4b143
commit f02cd40
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
@@ -173,7 +173,7 @@ function index($sa = null)
                         {
                             Yii::app()->setFlashMessage(gT("Failed to update answers"),'error');
                         }
-                    } 
+                    }
                     // Updating code (oldcode!==null) => update condition with the new code
                     $sOldCode=Yii::app()->request->getPost('oldcode_'.$iSortOrderID.'_'.$iScaleID);
                     if(isset($sOldCode) && $sCode !== $sOldCode) {
@@ -286,11 +286,11 @@ function index($sa = null)
                                 $oSubQuestion->parent_qid=$iQuestionID;
                                 $oSubQuestion->language=$sLanguage;
                                 $oSubQuestion->scale_id=$iScaleID;
-                                if(isset($aRelevance[0][$iPosition]))
+                                if(isset($aRelevance[$iScaleID][$iPosition]))
                                 {
-                                    $oSubQuestion->relevance=$aRelevance[0][$iPosition];
+                                    $oSubQuestion->relevance=$aRelevance[$iScaleID][$iPosition];
                                 }
-                                else 
+                                else
                                 {
                                     $oSubQuestion->relevance='';
                                 }
@@ -309,7 +309,14 @@ function index($sa = null)
                                 $oSubQuestion->parent_qid=$iQuestionID;
                                 $oSubQuestion->language=$sLanguage;
                                 $oSubQuestion->scale_id=$iScaleID;
-                                $oSubQuestion->relevance=$aRelevance[$iScaleID][$iPosition];
+                                if(isset($aRelevance[$iScaleID][$iPosition]))
+                                {
+                                    $oSubQuestion->relevance=$aRelevance[$iScaleID][$iPosition];
+                                }
+                                else
+                                {
+                                    $oSubQuestion->relevance='';
+                                }
                             }
                         }
                         if ($oSubQuestion->qid) {