Fixed issue #14182: Database error when trying to define a quota

LimeSurvey · Nov 16, 2018 · 49f76c6 · 49f76c6 · c-schmitz · Nov 16, 2018
1 parent b61f1ff
commit 49f76c6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -1834,8 +1834,12 @@ private function getQuestionOrderCriteria()
         $criteria->with = array(
             'survey.groups',
         );
-        $criteria->order = Yii::app()->db->quoteColumnName('groups.group_order').','
-            .Yii::app()->db->quoteColumnName('t.question_order');
+
+        if (Yii::app()->db->driverName == 'sqlsrv'){
+            $criteria->order = Yii::app()->db->quoteColumnName('t.question_order');
+        } else {
+            $criteria->order = Yii::app()->db->quoteColumnName('groups.group_order').','.Yii::app()->db->quoteColumnName('t.question_order');
+        }
         $criteria->addCondition('groups.gid=t.gid', 'AND');
         return $criteria;