From 5bd6ba362d68df3fe3ffb138eccda68cf9d5f530 Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Thu, 9 Jun 2016 16:06:03 +0200
Subject: [PATCH] Fixed issue #11353: Unable to movbe to next page on survey
 list Fixed issue #11283: pagination in Questions in this survey causes a SQL
 error (MSSQL)

---
 application/models/Question.php | 6 ++++--
 application/models/Survey.php   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/models/Question.php b/application/models/Question.php
index 0c430dca209..a10ef687eb4 100644
--- a/application/models/Question.php
+++ b/application/models/Question.php
@@ -891,7 +891,8 @@ public function search()
             'desc'=>'groups.group_name desc',
           ),
         );
-        $sort->defaultOrder = array('t.question_order' => CSort::SORT_ASC, 'groups.group_order' => CSort::SORT_ASC);
+        //$sort->defaultOrder = array('t.question_order' => CSort::SORT_ASC, 'groups.group_order' => CSort::SORT_ASC);
+        $sort->defaultOrder = array('question_order' => CSort::SORT_ASC );
 
         $criteria = new CDbCriteria;
         $criteria->with=array('groups');
@@ -907,13 +908,14 @@ public function search()
         $qid_reference = (Yii::app()->db->getDriverName() == 'pgsql' ?' t.qid::varchar' : 't.qid');
         $criteria2->compare($qid_reference, $this->title, true, 'OR');
 
-        $criteria->mergeWith($criteria2, 'AND');
 
         if($this->group_name != '')
         {
             $criteria->compare('groups.group_name', $this->group_name, true, 'AND');
         }
 
+        $criteria->mergeWith($criteria2, 'AND');
+
         $dataProvider=new CActiveDataProvider('Question', array(
             'criteria'=>$criteria,
             'sort'=>$sort,
diff --git a/application/models/Survey.php b/application/models/Survey.php
index 2c6e3f7ede9..d07b47efd96 100644
--- a/application/models/Survey.php
+++ b/application/models/Survey.php
@@ -941,7 +941,7 @@ public function search()
           ),
 
         );
-        $sort->defaultOrder = array('t.datecreated' => CSort::SORT_DESC);
+        $sort->defaultOrder = array('creation_date' => CSort::SORT_DESC);
 
         $criteria = new CDbCriteria;
         $aWithRelations = array('correct_relation_defaultlanguage');