Fixed issue #19203: alphabetical order didn't respect survey language (…

…#3581)
LimeSurvey · Nov 3, 2023 · 000db27 · 000db27
1 parent 2227098
commit 000db27
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/application/models/Question.php b/application/models/Question.php
@@ -726,7 +726,13 @@ public function getbuttons()
         return $buttons;
     }
 
-    public function getOrderedAnswers($scale_id = null)
+    /**
+     * get the ordered answers
+     * @param null|integer scale
+     * @param null|string $language
+     * @return array
+     */
+    public function getOrderedAnswers($scale_id = null, $language = null)
     {
         //reset answers set prior to this call
         $aAnswerOptions = [
@@ -745,17 +751,18 @@ public function getOrderedAnswers($scale_id = null)
             return $aAnswerOptions[$scale_id];
         }
 
-        $aAnswerOptions = $this->sortAnswerOptions($aAnswerOptions);
+        $aAnswerOptions = $this->sortAnswerOptions($aAnswerOptions, $language);
         return $aAnswerOptions;
     }
 
     /**
      * Returns the specified answer options sorted according to the question attributes.
      * Refactored from getOrderedAnswers();
      * @param array<int,Answer[]> The answer options to sort
+     * @param null|string $language
      * @return array<int,Answer[]>
      */
-    private function sortAnswerOptions($answerOptions)
+    private function sortAnswerOptions($answerOptions, $language = null)
     {
         // Sort randomly if applicable
         if ($this->shouldOrderAnswersRandomly()) {
@@ -774,15 +781,17 @@ private function sortAnswerOptions($answerOptions)
 
         // Sort alphabetically if applicable
         if ($this->shouldOrderAnswersAlphabetically()) {
+            if (empty($language) || !in_array($language, $this->survey->allLanguages)) {
+                $language = $this->survey->language;
+            }
             foreach ($answerOptions as $scaleId => $scaleArray) {
                 $sorted = array();
 
-                // We create an aray sorted that will use the answer in the current language as key, and that will store its old index as value
+                // We create an array sorted that will use the answer in the current language as key, and that will store its old index as value
                 foreach ($scaleArray as $key => $answer) {
-                    $sorted[$answer->answerl10ns[$this->survey->language]->answer] = $key;
+                    $sorted[$answer->answerl10ns[$language]->answer] = $key;
                 }
                 ksort($sorted);
-
                 // Now, we create a new array that store the old values of $answerOptions in the order of $sorted
                 $sortedScaleAnswers = array();
                 foreach ($sorted as $answer => $key) {

diff --git a/application/models/QuestionBaseRenderer.php b/application/models/QuestionBaseRenderer.php
@@ -261,7 +261,7 @@ protected function setSubquestions($scale_id = null)
 
     protected function setAnsweroptions($scale_id = null)
     {
-        $this->aAnswerOptions = $this->oQuestion->getOrderedAnswers($scale_id);
+        $this->aAnswerOptions = $this->oQuestion->getOrderedAnswers($scale_id, $this->sLanguage);
     }
 
     protected function getAnswerCount($iScaleId = 0)

diff --git a/application/models/QuestionCreate.php b/application/models/QuestionCreate.php
@@ -73,11 +73,9 @@ public static function getInstance($iSurveyId, $type = null, $themeName = null)
     }
 
     /**
-     * @param int|null $scale_id
-     * @return array|null
-     * @todo Why return both empty array and null?
+     * @inheritdoc
      */
-    public function getOrderedAnswers($scale_id = null)
+    public function getOrderedAnswers($scale_id = null, $language = null)
     {
         if ($scale_id == null) {
             return [];