Fixed issue : Error after reordering a question used in condition

Dev: use Question::model()->findByPk()
LimeSurvey · Oct 23, 2015 · e64a3b6 · e64a3b6
1 parent f4e1087
commit e64a3b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -1027,7 +1027,8 @@ private function _reorderGroup($iSurveyID)
                 $gid = (int)substr($parent, 1);
                 if (!isset($questionorder[$gid]))
                     $questionorder[$gid] = 0;
-                $question = Question::model()->getQuestionById($qid);
+				$sBaseLanguage = Survey::model()->findByPk($iSurveyID)->language;
+				$question = Question::model()->findByPk(array("qid"=>$qid,'language'=>$sBaseLanguage));
                 $oldgid = $question['gid'];
                 if($oldgid != $gid) {
                         fixMovedQuestionConditions($qid,$oldgid,$gid,$iSurveyID);

diff --git a/application/models/Question.php b/application/models/Question.php
@@ -266,16 +266,6 @@ public function getAdvancedSettingsWithValues($iQuestionID, $sQuestionType, $iSu
             return $aAttributeNames;
         }
 
-        function getQuestionById($qid)
-        {
-            return Yii::app()->db->createCommand()
-            ->select()
-            ->from(self::tableName())
-            ->where('qid=:qid')
-            ->bindParam(":qid", $qid, PDO::PARAM_INT)
-            ->queryRow();
-        }
-
         function getQuestions($sid, $gid, $language)
         {
             return Yii::app()->db->createCommand()