Merge branch 'MDL-71696-fix-oracle' of https://github.com/sarjona/moodle

moodle · Feb 3, 2022 · ecbdf3f · ecbdf3f
2 parents 29f699c + dc8b6a8
commit ecbdf3f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mod/quiz/classes/question/bank/custom_view.php b/mod/quiz/classes/question/bank/custom_view.php
@@ -258,7 +258,7 @@ protected function init_sort_from_params(): void {
     protected function build_query(): void {
         // Get the required tables and fields.
         $joins = [];
-        $fields = ['qv.status', 'qc.id', 'qv.version', 'qv.id as versionid', 'qbe.id as questionbankentryid'];
+        $fields = ['qv.status', 'qc.id as categoryid', 'qv.version', 'qv.id as versionid', 'qbe.id as questionbankentryid'];
         if (!empty($this->requiredcolumns)) {
             foreach ($this->requiredcolumns as $column) {
                 $extrajoins = $column->get_extra_joins();

diff --git a/question/classes/local/bank/view.php b/question/classes/local/bank/view.php
@@ -561,7 +561,7 @@ public function new_sort_url($sort, $newsortreverse): string {
     protected function build_query(): void {
         // Get the required tables and fields.
         $joins = [];
-        $fields = ['qv.status', 'qc.id', 'qv.version', 'qv.id as versionid', 'qbe.id as questionbankentryid'];
+        $fields = ['qv.status', 'qc.id as categoryid', 'qv.version', 'qv.id as versionid', 'qbe.id as questionbankentryid'];
         if (!empty($this->requiredcolumns)) {
             foreach ($this->requiredcolumns as $column) {
                 $extrajoins = $column->get_extra_joins();