Fixed issue: Group table name is not escaped for PostgreSQL in quick …

…translation view
LimeSurvey · Apr 20, 2021 · d5f5899 · d5f5899
1 parent eb9229e
commit d5f5899
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/application/controllers/admin/translate.php b/application/controllers/admin/translate.php
@@ -859,19 +859,19 @@ private function query($type, $action, $iSurveyID, $tolang, $baselang, $id1 = ""
                         return QuestionGroup::model()->with('questiongroupl10ns', array('condition' => 'language = ' . $baselang))->findAllByAttributes(array('sid' => $iSurveyID), array('order' => 't.gid'));
                     case 'question':
                     case 'question_help':
-                        return Question::model()->with('questionl10ns', array('condition' => 'language = ' . $baselang))->with('parent', 'group')->findAllByAttributes(array('sid' => $iSurveyID, 'parent_qid' => 0), array('order' => 'group.group_order, t.question_order, t.scale_id'));
+                        return Question::model()->with('questionl10ns', array('condition' => 'language = ' . $baselang))->with('parent', 'group')->findAllByAttributes(array('sid' => $iSurveyID, 'parent_qid' => 0), array('order' => 'group_order, t.question_order, t.scale_id'));
                     case 'subquestion':
                         return Question::model()
                         ->with('questionl10ns', array('condition' => 'language = ' . $baselang))
                         ->with('parent', array('condition' => 'language = ' . $baselang))
                         ->with('group', array('condition' => 'language = ' . $baselang))
-                        ->findAllByAttributes(array('sid' => $iSurveyID), array('order' => 'group.group_order, parent.question_order, t.scale_id, t.question_order', 'condition' => 't.parent_qid>0', 'params' => array()));
+                        ->findAllByAttributes(array('sid' => $iSurveyID), array('order' => 'group_order, parent.question_order, t.scale_id, t.question_order', 'condition' => 't.parent_qid>0', 'params' => array()));
                     case 'answer':
                         return Answer::model()
                         ->with('answerl10ns', array('condition' => 'language = ' . $baselang))
                         ->with('question')
                         ->with('group')
-                        ->findAllByAttributes(array(), array('order' => 'group.group_order, question.question_order, t.scale_id, t.sortorder', 'condition' => 'question.sid=:sid', 'params' => array(':sid' => $iSurveyID)));
+                        ->findAllByAttributes(array(), array('order' => 'group_order, question.question_order, t.scale_id, t.sortorder', 'condition' => 'question.sid=:sid', 'params' => array(':sid' => $iSurveyID)));
                 }
             case "queryupdate":
                 switch ($type) {

diff --git a/application/models/Answer.php b/application/models/Answer.php
@@ -64,7 +64,7 @@ public function relations()
                 'on' => "$alias.qid = question.qid",
             ),
             'group' => array(self::BELONGS_TO, 'QuestionGroup', '', 'through' => 'question',
-                'on' => 'question.gid = group.gid'
+                'on' => 'question.gid = ' . Yii::app()->db->quoteTableName('group') . '.gid'
             ),
             'answerl10ns' => array(self::HAS_MANY, 'AnswerL10n', 'aid', 'together' => true),
             'questionl10ns' => array(self::HAS_MANY, 'QuestionL10n', 'qid', 'together' => true)