Fixed issue #10801: PHP notice + bad relevance set in Array text subq…

…uestion edit Dev: use isset($aRelevance[$iScaleID][$iPosition]) directly
LimeSurvey · Mar 21, 2016 · 3d58850 · 3d58850
1 parent c9254bd
commit 3d58850
Showing 1 changed file with 4 additions and 12 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) {
@@ -270,8 +270,7 @@ function index($sa = null)
                             $oSubQuestion->title=$aCodes[$iScaleID][$iPosition];
                             $oSubQuestion->question=$subquestionvalue;
                             $oSubQuestion->scale_id=$iScaleID;
-                            //dual matrix, text/number matrix: subQ relevance per line not per scale, so ScaleID is always 0
-                            $oSubQuestion->relevance=$aRelevance[0][$iPosition];
+                            $oSubQuestion->relevance=isset($aRelevance[$iScaleID][$iPosition]) ? $aRelevance[$iScaleID][$iPosition] : "";
                         }
                         else  // new record
                         {
@@ -286,14 +285,7 @@ function index($sa = null)
                                 $oSubQuestion->parent_qid=$iQuestionID;
                                 $oSubQuestion->language=$sLanguage;
                                 $oSubQuestion->scale_id=$iScaleID;
-                                if(isset($aRelevance[0][$iPosition]))
-                                {
-                                    $oSubQuestion->relevance=$aRelevance[0][$iPosition];
-                                }
-                                else 
-                                {
-                                    $oSubQuestion->relevance='';
-                                }
+                                $oSubQuestion->relevance=isset($aRelevance[$iScaleID][$iPosition]) ? $aRelevance[$iScaleID][$iPosition] : "";
                             }
                             else                                                //new record: additional language
                             {
@@ -309,7 +301,7 @@ function index($sa = null)
                                 $oSubQuestion->parent_qid=$iQuestionID;
                                 $oSubQuestion->language=$sLanguage;
                                 $oSubQuestion->scale_id=$iScaleID;
-                                $oSubQuestion->relevance=$aRelevance[$iScaleID][$iPosition];
+                                $oSubQuestion->relevance=isset($aRelevance[$iScaleID][$iPosition]) ? $aRelevance[$iScaleID][$iPosition] : "";
                             }
                         }
                         if ($oSubQuestion->qid) {