Merge branch 'MDL-75752' of https://github.com/timhunt/moodle

HirotoKagotani · Oct 6, 2022 · 29e1f71 · 29e1f71
2 parents 3c10b0c + 57ee14c
commit 29e1f71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/question/bank/comment/backup/moodle2/backup_qbank_comment_plugin.class.php b/question/bank/comment/backup/moodle2/backup_qbank_comment_plugin.class.php
@@ -46,10 +46,13 @@ protected function define_question_plugin_structure() {
         $pluginwrapper->add_child($comments);
         $comments->add_child($comment);
 
+        // Trying to pass an param (contextid) with an int value seems to have special meaning, so just inline.
+        // It is an int, so minimal security risk.
         $comment->set_source_sql("SELECT c.*
                                         FROM {comments} c
-                                       WHERE c.commentarea = 'question'
+                                       WHERE c.contextid = " . context_system::instance()->id . "
                                          AND c.component = 'qbank_comment'
+                                         AND c.commentarea = 'question'
                                          AND c.itemid = ?", [backup::VAR_PARENTID]);
 
         $comment->annotate_ids('user', 'userid');

diff --git a/question/bank/comment/tests/backup_test.php b/question/bank/comment/tests/backup_test.php
@@ -152,9 +152,8 @@ public function test_backup_restore() {
         $question2 = $this->qgen->create_question('shortanswer', null, $this->question2data);
 
         // Add comments to the questions.
-        $coursecontext = \context_course::instance($this->course->id);
         $args = new \stdClass;
-        $args->context = $coursecontext;
+        $args->context = \context_system::instance();
         $args->course = $this->course;
         $args->area = 'question';
         $args->itemid = $question1->id;