Dev Fixed slow performance while navigating in questions

LimeSurvey · Jan 18, 2018 · 3e9d946 · 3e9d946
1 parent 9633598
commit 3e9d946
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/application/models/QuestionAttribute.php b/application/models/QuestionAttribute.php
@@ -182,7 +182,7 @@ public function getQuestionAttributes($iQuestionID, $sLanguage = null)
             return $aQuestionAttributesStatic[$iQuestionID];
         }
         $aQuestionAttributes = array();
-        $oQuestion = Question::model()->find("qid=:qid", array('qid'=>$iQuestionID)); // Maybe take parent_qid attribute before this qid attribute
+        $oQuestion = Question::model()->with('survey')->find("qid=:qid", array('qid'=>$iQuestionID)); // Maybe take parent_qid attribute before this qid attribute
 
         if ($oQuestion) {
             if ($sLanguage) {

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -305,7 +305,7 @@ public function relations()
 
     public function defaultScope()
     {
-        return array('order'=>'sid');
+        return array('order'=>'t.sid');
     }    
 
     /** @inheritdoc */