Merge branch 'master' into develop

LimeSurvey · Sep 23, 2021 · 13fbfd4 · 13fbfd4
2 parents ab01c8c + e7979e1
commit 13fbfd4
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 83 deletions.
diff --git a/application/commands/UpdateDbCommand.php b/application/commands/UpdateDbCommand.php
@@ -40,6 +40,7 @@ public function run($args = null)
             echo "Update " . Yii::app()->db->connectionString . " with prefix :";
             echo Yii::app()->db->tablePrefix . " from {$currentDbVersion} to {$newDbVersion}\n";
             Yii::import('application.helpers.common_helper', true);
+            Yii::import('application.helpers.update.update_helper', true);
             Yii::import('application.helpers.update.updatedb_helper', true);
             Yii::import('application.helpers.update.update_helper', true);
             $result = db_upgrade_all($currentDbVersion);

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -1621,6 +1621,7 @@ public function exportdialog(int $iSurveyId)
 
             // White Close Button
             $aData['showWhiteCloseButton'] = true;
+            $aData['closeUrl'] = Yii::app()->createUrl('admin/tokens/sa/index/surveyid/' . $iSurveyId);
 
             $aData['topBar']['name'] = 'tokensTopbar_view';
             $aData['topBar']['rightSideView'] = 'tokensTopbarRight_view';
@@ -2215,6 +2216,7 @@ public function import($iSurveyId)
         $aData['thischaracterset'] = $thischaracterset;
 
         $aData['showCloseButton'] = true;
+        $aData['closeUrl'] = Yii::app()->createUrl('admin/tokens/sa/index/surveyid/' . $iSurveyId);
         $aData['topBar']['name'] = 'tokensTopbar_view';
         $aData['topBar']['rightSideView'] = 'tokensTopbarRight_view';
 
@@ -2490,6 +2492,7 @@ public function _handletokenform($iSurveyId, $subaction, $iTokenId = "", $ajax =
         $aData['showSaveAndCloseButton'] = true;
         // White Close Button
         $aData['showWhiteCloseButton'] = true;
+        $aData['closeUrl'] = Yii::app()->createUrl('admin/tokens/sa/index/surveyid/' . $iSurveyId);
 
         $aData['topBar']['name'] = 'tokensTopbar_view';
         $aData['topBar']['rightSideView'] = 'tokensTopbarRight_view';

diff --git a/application/core/LSYii_ImageValidator.php b/application/core/LSYii_ImageValidator.php
@@ -73,7 +73,7 @@ public static function validateImage($file)
             $result['uploadresult'] = '';
             $result['check'] = true;
         } else {
-            $result['uploadresult'] = gT("This file is not a supported image - please only upload JPG,PNG,GIF or SVG type images.");
+            $result['uploadresult'] = sprintf(gT("This file is not a supported image format - only the following ones are allowed: %s"),strtoupper(Yii::app()->getConfig('allowedthemeimageformats')));
             $result['check'] = false;
         }
         return $result;

diff --git a/application/core/QuestionTypes/ListRadioFlexible/DataSetListRadioFlexible.php b/application/core/QuestionTypes/ListRadioFlexible/DataSetListRadioFlexible.php
diff --git a/application/core/QuestionTypes/ListRadioFlexible/RenderListRadioFlexible.php b/application/core/QuestionTypes/ListRadioFlexible/RenderListRadioFlexible.php
diff --git a/application/helpers/admin/activate_helper.php b/application/helpers/admin/activate_helper.php
@@ -202,7 +202,7 @@ function checkQuestions($postsid, $iSurveyID)
         ->join('{{question_l10ns}} ls', 'ls.qid=q.qid')
         ->andWhere("(SELECT count(*) from {{answers}} as a where a.qid=q.qid and scale_id=0)=0")
         ->andWhere("sid=:sid", [':sid' => $iSurveyID])
-        ->andWhere("type IN ('" . Question::QT_F_ARRAY_FLEXIBLE_ROW . "', '" . Question::QT_H_ARRAY_FLEXIBLE_COLUMN . "', '" . Question::QT_Z_LIST_RADIO_FLEXIBLE . "', '" . Question::QT_1_ARRAY_MULTISCALE . "')")
+        ->andWhere("type IN ('" . Question::QT_F_ARRAY_FLEXIBLE_ROW . "', '" . Question::QT_H_ARRAY_FLEXIBLE_COLUMN . "', '" . Question::QT_1_ARRAY_MULTISCALE . "')")
         ->andWhere("q.parent_qid=0");
     $chkresult = $chkquery->queryAll();
     foreach ($chkresult as $chkrow) {