Fixed issue #17594: Token language does not work in upper case

LimeSurvey · Dec 7, 2021 · d1cb11b · d1cb11b
1 parent f7deb99
commit d1cb11b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/application/models/Token.php b/application/models/Token.php
@@ -418,7 +418,7 @@ public function rules()
             array('firstname', 'filter', 'filter' => array(self::class, 'sanitizeAttribute')),
             array('lastname', 'filter', 'filter' => array(self::class, 'sanitizeAttribute')),
             array('language', 'LSYii_Validators', 'isLanguage' => true),
-            array('language','in','range' => array($this->survey->language) + explode(' ', $this->survey->additional_languages),'allowEmpty' => true,'message' => gT('Language code is invalid in this survey')),
+            array('language','in','range' => array_merge(array($this->survey->language),explode(' ', $this->survey->additional_languages)),'allowEmpty' => true,'message' => gT('Language code is invalid in this survey')),
             array(implode(',', $this->tableSchema->columnNames), 'safe'),
             /* pseudo date : force date or specific string ? */
             array('remindersent', 'length', 'min' => 0, 'max' => 17),