Fixed issue #13010: MySQL 8 reserved word used as table alias in query

LimeSurvey · Jan 29, 2018 · 8f84b48 · 8f84b48
1 parent 61f1fa7
commit 8f84b48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -1542,12 +1542,12 @@ function createFieldMap($survey, $style = 'short', $force_refresh = false, $ques
 
     // Main query
     $aquery = "SELECT * "
-    ." FROM {{questions}} as questions, {{groups}} as groups"
-    ." WHERE questions.gid=groups.gid AND "
+    ." FROM {{questions}} as questions, {{groups}} as question_groups"
+    ." WHERE questions.gid=question_groups.gid AND "
     ." questions.sid=$surveyid AND "
     ." questions.language='{$sLanguage}' AND "
     ." questions.parent_qid=0 AND "
-    ." groups.language='{$sLanguage}' ";
+    ." question_groups.language='{$sLanguage}' ";
     if ($questionid !== false) {
         $aquery .= " and questions.qid={$questionid} ";
     }

diff --git a/application/models/Question.php b/application/models/Question.php
@@ -419,10 +419,10 @@ public function getQuestionsForStatistics($fields, $condition, $orderby = false)
      */
     public function getQuestionList($surveyid, $language)
     {
-        $query = "SELECT questions.*, groups.group_name, groups.group_order"
-            ." FROM {{questions}} as questions, {{groups}} as groups"
-            ." WHERE groups.gid=questions.gid"
-            ." AND groups.language=:language1"
+        $query = "SELECT questions.*, question_groups.group_name, question_groups.group_order"
+            ." FROM {{questions}} as questions, {{groups}} as question_groups"
+            ." WHERE question_groups.gid=questions.gid"
+            ." AND question_groups.language=:language1"
             ." AND questions.language=:language2"
             ." AND questions.parent_qid=0"
             ." AND questions.sid=:sid";