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

…question edit Dev: use isset($aRelevance[$iScaleID][$iPosition]) directly Dev: if a plugin or if we do in core want to set relevance to scale 1 : less update to do ;)
LimeSurvey · Mar 21, 2016 · 22edaa9 · 22edaa9
1 parent ac4439f
commit 22edaa9
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
@@ -288,7 +288,7 @@ function index($sa = null)
                             $oSubQuestion->title=$aCodes[$iScaleID][$iPosition];
                             $oSubQuestion->question=$subquestionvalue;
                             $oSubQuestion->scale_id=$iScaleID;
-                            $oSubQuestion->relevance=$aRelevance[0][$iPosition];
+                            $oSubQuestion->relevance=isset($aRelevance[$iScaleID][$iPosition]) ? $aRelevance[$iScaleID][$iPosition] : "";
                         }
                         else  // new record
                         {
@@ -303,14 +303,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
                             {
@@ -326,7 +319,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) {