From 7419d5d319f09426c3730b7c10b25ba5d8e6fdf2 Mon Sep 17 00:00:00 2001
From: Philipp Imhof <52650214+PhilippImhof@users.noreply.github.com>
Date: Sun, 12 Nov 2023 14:19:27 +0100
Subject: [PATCH 01/75] MDL-80087 Questions: warn if preload_all_step_users was
 not called

Co-authored-by: Tim Hunt <T.J.Hunt@open.ac.uk>
---
 mod/quiz/classes/external.php              |  4 ++++
 mod/quiz/tests/external/external_test.php  |  2 +-
 question/engine/questionattemptstep.php    | 24 +++++++++++++---------
 question/engine/questionusage.php          |  5 ++---
 question/engine/tests/helpers.php          | 16 +++++++++------
 question/engine/tests/walkthrough_test.php |  8 ++++++++
 6 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/mod/quiz/classes/external.php b/mod/quiz/classes/external.php
index e0120d8ea5d45..0f860ebe25964 100644
--- a/mod/quiz/classes/external.php
+++ b/mod/quiz/classes/external.php
@@ -1473,6 +1473,10 @@ public static function get_attempt_review($attemptid, $page = -1) {
             $page = 'all';
         }
 
+        // Make sure all users associated to the attempt steps are loaded. Otherwise, this will
+        // trigger a debugging message.
+        $attemptobj->preload_all_attempt_step_users();
+
         // Prepare the output.
         $result = [];
         $result['attempt'] = $attemptobj->get_attempt();
diff --git a/mod/quiz/tests/external/external_test.php b/mod/quiz/tests/external/external_test.php
index 9824e71e160e6..ff0c6be73d559 100644
--- a/mod/quiz/tests/external/external_test.php
+++ b/mod/quiz/tests/external/external_test.php
@@ -1720,7 +1720,7 @@ public function test_get_attempt_review() {
         $this->assertEquals('gradedright', $result['questions'][0]['state']);
         $this->assertEquals(1, $result['questions'][0]['slot']);
 
-         $this->assertCount(1, $result['additionaldata']);
+        $this->assertCount(1, $result['additionaldata']);
         $this->assertEquals('feedback', $result['additionaldata'][0]['id']);
         $this->assertEquals('Feedback', $result['additionaldata'][0]['title']);
         $this->assertEquals('Feedback text 1', $result['additionaldata'][0]['content']);
diff --git a/question/engine/questionattemptstep.php b/question/engine/questionattemptstep.php
index f8bddf6850733..da1750a090e49 100644
--- a/question/engine/questionattemptstep.php
+++ b/question/engine/questionattemptstep.php
@@ -87,10 +87,10 @@ class question_attempt_step {
      */
     private $fraction = null;
 
-    /** @var integer the timestamp when this step was created. */
+    /** @var int the timestamp when this step was created. */
     private $timecreated;
 
-    /** @var integer the id of the user resonsible for creating this step. */
+    /** @var int the id of the user responsible for creating this step. */
     private $userid;
 
     /** @var array name => value pairs. The submitted data. */
@@ -99,7 +99,7 @@ class question_attempt_step {
     /** @var array name => array of {@see stored_file}s. Caches the contents of file areas. */
     private $files = array();
 
-    /** @var stdClass User information. */
+    /** @var stdClass|null User information. */
     private $user = null;
 
     /**
@@ -107,12 +107,12 @@ class question_attempt_step {
      * normally created by {@see question_attempt} methods like
      * {@see question_attempt::process_action()}.
      * @param array $data the submitted data that defines this step.
-     * @param int $timestamp the time to record for the action. (If not given, use now.)
-     * @param int $userid the user to attribute the aciton to. (If not given, use the current user.)
-     * @param int $existingstepid if this step is going to replace an existing step
+     * @param int|null $timecreated the time to record for the action. (If not given, use now.)
+     * @param int|null $userid the user to attribute the aciton to. (If not given, use the current user.)
+     * @param int|null $existingstepid if this step is going to replace an existing step
      *      (for example, during a regrade) this is the id of the previous step we are replacing.
      */
-    public function __construct($data = array(), $timecreated = null, $userid = null,
+    public function __construct($data = [], $timecreated = null, $userid = null,
             $existingstepid = null) {
         global $USER;
 
@@ -196,9 +196,13 @@ public function add_full_user_object(stdClass $user): void {
     /**
      * Return the full user object.
      *
-     * @return stdClass Get full user object.
+     * @return null|stdClass Get full user object.
      */
-    public function get_user(): stdClass {
+    public function get_user(): ?stdClass {
+        if ($this->user === null) {
+            debugging('Attempt to access the step user before it was initialised. ' .
+                'Did you forget to call question_usage_by_activity::preload_all_step_users() or similar?', DEBUG_DEVELOPER);
+        }
         return $this->user;
     }
 
@@ -208,7 +212,7 @@ public function get_user(): stdClass {
      * @return string full name of user.
      */
     public function get_user_fullname(): string {
-        return fullname($this->user);
+        return fullname($this->get_user());
     }
 
     /** @return int the timestamp when this step was created. */
diff --git a/question/engine/questionusage.php b/question/engine/questionusage.php
index c1aa1542014c1..798e369d738b7 100644
--- a/question/engine/questionusage.php
+++ b/question/engine/questionusage.php
@@ -1030,9 +1030,8 @@ public function preload_all_step_users(): void {
         // Update user information for steps.
         foreach ($this->questionattempts as $qa) {
             foreach ($qa->get_full_step_iterator() as $step) {
-                $user = $users[$step->get_user_id()];
-                if (isset($user)) {
-                    $step->add_full_user_object($user);
+                if (isset($users[$step->get_user_id()])) {
+                    $step->add_full_user_object($users[$step->get_user_id()]);
                 }
             }
         }
diff --git a/question/engine/tests/helpers.php b/question/engine/tests/helpers.php
index 402e2c10b5bb4..f83d9697a413e 100644
--- a/question/engine/tests/helpers.php
+++ b/question/engine/tests/helpers.php
@@ -791,11 +791,13 @@ public function __construct($pattern, $message = '') {
 abstract class qbehaviour_walkthrough_test_base extends question_testcase {
     /** @var question_display_options */
     protected $displayoptions;
+
     /** @var question_usage_by_activity */
     protected $quba;
-    /** @var integer */
 
+    /** @var int The slot number of the question_attempt we are using in $quba. */
     protected $slot;
+
     /**
      * @var string after {@link render()} has been called, this contains the
      * display of the question in its current state.
@@ -804,7 +806,8 @@ abstract class qbehaviour_walkthrough_test_base extends question_testcase {
 
     protected function setUp(): void {
         parent::setUp();
-        $this->resetAfterTest(true);
+        $this->resetAfterTest();
+        $this->setAdminUser();
 
         $this->displayoptions = new question_display_options();
         $this->quba = question_engine::make_questions_usage_by_activity('unit_test',
@@ -914,6 +917,7 @@ protected function check_current_mark($mark) {
      * $this->currentoutput so that it can be verified.
      */
     protected function render() {
+        $this->quba->preload_all_step_users();
         $this->currentoutput = $this->quba->render_question($this->slot, $this->displayoptions);
     }
 
@@ -1005,9 +1009,9 @@ protected function get_tag_matcher($tag, $attributes) {
      * @param $condition one or more Expectations. (users varargs).
      */
     protected function check_current_output() {
-        $html = $this->quba->render_question($this->slot, $this->displayoptions);
+        $this->render();
         foreach (func_get_args() as $condition) {
-            $this->assert($condition, $html);
+            $this->assert($condition, $this->currentoutput);
         }
     }
 
@@ -1019,9 +1023,9 @@ protected function check_current_output() {
      * @param question_contains_select_expectation $expectations One or more expectations.
      */
     protected function check_output_contains_selectoptions(...$expectations) {
-        $html = $this->quba->render_question($this->slot, $this->displayoptions);
+        $this->render();
         foreach ($expectations as $expectation) {
-            $this->assert_select_options($expectation, $html);
+            $this->assert_select_options($expectation, $this->currentoutput);
         }
     }
 
diff --git a/question/engine/tests/walkthrough_test.php b/question/engine/tests/walkthrough_test.php
index a834b003aa412..678f7a57d337d 100644
--- a/question/engine/tests/walkthrough_test.php
+++ b/question/engine/tests/walkthrough_test.php
@@ -107,6 +107,7 @@ public function test_action_author_with_display_options_testcase() {
         $displayoptions->userinfoinhistory = question_display_options::SHOW_ALL;
 
         $this->load_quba();
+        $this->quba->preload_all_step_users();
         $result = $this->quba->render_question($this->slot, $displayoptions);
         $numsteps = $this->quba->get_question_attempt($this->slot)->get_num_steps();
 
@@ -121,6 +122,13 @@ public function test_action_author_with_display_options_testcase() {
 
         $this->load_quba();
         $result = $this->quba->render_question($this->slot, $displayoptions);
+        $message = 'Attempt to access the step user before it was initialised.';
+        $message .= ' Did you forget to call question_usage_by_activity::preload_all_step_users() or similar?';
+        $this->assertDebuggingCalled($message, DEBUG_DEVELOPER);
+        $this->resetDebugging();
+        $this->quba->preload_all_step_users();
+        $result = $this->quba->render_question($this->slot, $displayoptions);
+        $this->assertDebuggingNotCalled();
 
         // The step just show the user profile link if the step's userid is different with student id.
         preg_match_all("/<a ?.*>(.*)<\/a>/", $result, $matches);

From d9a8eb2bdbc7d51630b465784a2281d7a76c8a14 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Sun, 7 Apr 2024 23:31:26 +0800
Subject: [PATCH 02/75] MDL-81457 core: Mark SSL test as skipped, not
 incomplete

The incomplete test is intended for tests which are written but whose
code does not yet exist.

https://docs.phpunit.de/en/9.6/incomplete-and-skipped-tests.html
---
 lib/dml/tests/mysqli_native_moodle_database_test.php | 3 ++-
 lib/dml/tests/pgsql_native_moodle_database_test.php  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/dml/tests/mysqli_native_moodle_database_test.php b/lib/dml/tests/mysqli_native_moodle_database_test.php
index dd17338224abb..565ee41c26623 100644
--- a/lib/dml/tests/mysqli_native_moodle_database_test.php
+++ b/lib/dml/tests/mysqli_native_moodle_database_test.php
@@ -122,7 +122,8 @@ public function test_ssl_connection(): void {
         } catch (moodle_exception $e) {
             // ... or fail.
             // Unfortunately we cannot be sure with the error string.
-            $this->markTestIncomplete('SSL not supported?');
+            $this->markTestSkipped('MySQL server does not support SSL. Unable to complete the test.');
+            return;
         }
 
         try {
diff --git a/lib/dml/tests/pgsql_native_moodle_database_test.php b/lib/dml/tests/pgsql_native_moodle_database_test.php
index 3e0a32e554641..09e6030391dc4 100644
--- a/lib/dml/tests/pgsql_native_moodle_database_test.php
+++ b/lib/dml/tests/pgsql_native_moodle_database_test.php
@@ -409,7 +409,8 @@ public function test_ssl_connection(): void {
             // ... or fail with SSL not supported.
             $this->assertStringContainsString($pgconnerr, $e->debuginfo);
             $this->assertStringContainsString('server does not support SSL', $e->debuginfo);
-            $this->markTestIncomplete('SSL not supported.');
+            $this->markTestSkipped('Postgres server does not support SSL. Unable to complete the test.');
+            return;
         }
 
         try {

From 5b9fdc0e9a8c8c1e006e67b00c79f4db4bf244f2 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Sun, 7 Apr 2024 23:31:26 +0800
Subject: [PATCH 03/75] MDL-81457 core: Do not mark tests as Incomplete when
 they are wrong

This check was marking a test as Incomplete if there was a bug in any
part of the test, rather than failing the test in such a way that the
test bug may be found.

https://docs.phpunit.de/en/9.6/incomplete-and-skipped-tests.html
---
 enrol/tests/externallib_test.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/enrol/tests/externallib_test.php b/enrol/tests/externallib_test.php
index d5ebb5dce8755..c81ac56a14321 100644
--- a/enrol/tests/externallib_test.php
+++ b/enrol/tests/externallib_test.php
@@ -328,8 +328,9 @@ public function test_get_enrolled_users_visibility($settings, $results) {
                 $this->expectExceptionMessage($exception['message']);
             } else {
                 // Failed, only canview and exception are supported.
-                $this->markTestIncomplete('Incomplete, only canview and exception are supported');
+                throw new \coding_exception('Incomplete, only canview and exception are supported');
             }
+
             // Switch to the user and assign the role.
             $this->setUser(${$user});
             role_assign($roleid, $USER->id, $coursecontext);

From dc0cf1f2735aeab764a324f784ff88497bd22102 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 13 Mar 2024 08:59:00 +0800
Subject: [PATCH 04/75] MDL-81209 core: Unit test should not care about plugin
 details

---
 lib/tests/component_test.php | 150 +++++++++++++++++++++++++++--------
 1 file changed, 118 insertions(+), 32 deletions(-)

diff --git a/lib/tests/component_test.php b/lib/tests/component_test.php
index 650a6d10ede17..2e82e59151827 100644
--- a/lib/tests/component_test.php
+++ b/lib/tests/component_test.php
@@ -26,7 +26,7 @@
  *
  * @covers \core_component
  */
-class component_test extends advanced_testcase {
+final class component_test extends advanced_testcase {
     /**
      * To be changed if number of subsystems increases/decreases,
      * this is defined here to annoy devs that try to add more without any thinking,
@@ -508,8 +508,10 @@ public function test_get_plugin_list_with_file(): void {
         $this->assertEquals([], array_keys($list));
     }
 
+    /**
+     * Tests for get_componenet_classes_in_namespace.
+     */
     public function test_get_component_classes_in_namespace(): void {
-
         // Unexisting.
         $this->assertCount(0, core_component::get_component_classes_in_namespace('core_unexistingcomponent', 'something'));
         $this->assertCount(0, core_component::get_component_classes_in_namespace('auth_cas', 'something'));
@@ -519,36 +521,6 @@ public function test_get_component_classes_in_namespace(): void {
         $this->assertCount(0, core_component::get_component_classes_in_namespace('core_user', 'course'));
         $this->assertCount(0, core_component::get_component_classes_in_namespace('mod_forum', 'output\\emaildigest'));
         $this->assertCount(0, core_component::get_component_classes_in_namespace('mod_forum', '\\output\\emaildigest'));
-        $this->assertCount(2, core_component::get_component_classes_in_namespace('mod_forum', 'output\\email'));
-        $this->assertCount(2, core_component::get_component_classes_in_namespace('mod_forum', '\\output\\email'));
-        $this->assertCount(2, core_component::get_component_classes_in_namespace('mod_forum', 'output\\email\\'));
-        $this->assertCount(2, core_component::get_component_classes_in_namespace('mod_forum', '\\output\\email\\'));
-
-        // Prefix with backslash if it doesn\'t come prefixed.
-        $this->assertCount(1, core_component::get_component_classes_in_namespace('auth_cas', 'task'));
-        $this->assertCount(1, core_component::get_component_classes_in_namespace('auth_cas', '\\task'));
-
-        // Core as a component works, the function can normalise the component name.
-        $this->assertCount(7, core_component::get_component_classes_in_namespace('core', 'update'));
-        $this->assertCount(7, core_component::get_component_classes_in_namespace('', 'update'));
-        $this->assertCount(7, core_component::get_component_classes_in_namespace('moodle', 'update'));
-
-        // Multiple levels.
-        $this->assertCount(5, core_component::get_component_classes_in_namespace('core_user', '\\output\\myprofile\\'));
-        $this->assertCount(5, core_component::get_component_classes_in_namespace('core_user', 'output\\myprofile\\'));
-        $this->assertCount(5, core_component::get_component_classes_in_namespace('core_user', '\\output\\myprofile'));
-        $this->assertCount(5, core_component::get_component_classes_in_namespace('core_user', 'output\\myprofile'));
-
-        // Without namespace it returns classes/ classes.
-        $this->assertCount(8, core_component::get_component_classes_in_namespace('tool_mobile', ''));
-        $this->assertCount(2, core_component::get_component_classes_in_namespace('tool_filetypes'));
-
-        // When no component is specified, classes are returned for the namespace in all components.
-        // (We don't assert exact amounts here as the count of `output` classes will change depending on plugins installed).
-        $this->assertGreaterThan(
-            count(\core_component::get_component_classes_in_namespace('core', 'output')),
-            count(\core_component::get_component_classes_in_namespace(null, 'output'))
-        );
 
         // Without either a component or namespace it returns an empty array.
         $this->assertEmpty(\core_component::get_component_classes_in_namespace());
@@ -556,6 +528,120 @@ public function test_get_component_classes_in_namespace(): void {
         $this->assertEmpty(\core_component::get_component_classes_in_namespace(null, ''));
     }
 
+    /**
+     * Test that the get_component_classes_in_namespace() function returns classes in the correct namespace.
+     *
+     * @dataProvider get_component_classes_in_namespace_provider
+     * @param array $methodargs
+     * @param string $expectedclassnameformat
+     */
+    public function test_get_component_classes_in_namespace_provider(
+        array $methodargs,
+        string $expectedclassnameformat,
+    ): void {
+        $classlist = core_component::get_component_classes_in_namespace(...$methodargs);
+        $this->assertGreaterThan(0, count($classlist));
+
+        foreach (array_keys($classlist) as $classname) {
+            $this->assertStringMatchesFormat($expectedclassnameformat, $classname);
+        }
+    }
+
+    /**
+     * Data provider for get_component_classes_in_namespace tests.
+     *
+     * @return array
+     */
+    public static function get_component_classes_in_namespace_provider(): array {
+        return [
+            // Matches the last namespace level name not partials.
+            [
+                ['mod_forum', 'output\\email'],
+                'mod_forum\output\email\%s',
+            ],
+            [
+                ['mod_forum', '\\output\\email'],
+                'mod_forum\output\email\%s',
+            ],
+            [
+                ['mod_forum', 'output\\email\\'],
+                'mod_forum\output\email\%s',
+            ],
+            [
+                ['mod_forum', '\\output\\email\\'],
+                'mod_forum\output\email\%s',
+            ],
+            // Prefix with backslash if it doesn\'t come prefixed.
+            [
+                ['auth_cas', 'task'],
+                'auth_cas\task\%s',
+            ],
+            [
+                ['auth_cas', '\\task'],
+                'auth_cas\task\%s',
+            ],
+
+            // Core as a component works, the function can normalise the component name.
+            [
+                ['core', 'update'],
+                'core\update\%s',
+            ],
+            [
+                ['', 'update'],
+                'core\update\%s',
+            ],
+            [
+                ['moodle', 'update'],
+                'core\update\%s',
+            ],
+
+            // Multiple levels.
+            [
+                ['core_user', '\\output\\myprofile\\'],
+                'core_user\output\myprofile\%s',
+            ],
+            [
+                ['core_user', 'output\\myprofile\\'],
+                'core_user\output\myprofile\%s',
+            ],
+            [
+                ['core_user', '\\output\\myprofile'],
+                'core_user\output\myprofile\%s',
+            ],
+            [
+                ['core_user', 'output\\myprofile'],
+                'core_user\output\myprofile\%s',
+            ],
+
+            // Without namespace it returns classes/ classes.
+            [
+                ['tool_mobile', ''],
+                'tool_mobile\%s',
+            ],
+            [
+                ['tool_filetypes'],
+                'tool_filetypes\%s',
+            ],
+
+            // Multiple levels.
+            [
+                ['core_user', '\\output\\myprofile\\'],
+                'core_user\output\myprofile\%s',
+            ],
+
+            // When no component is specified, classes are returned for the namespace in all components.
+            // (We don't assert exact amounts here as the count of `output` classes will change depending on plugins installed).
+            [
+                ['core', 'output'],
+                'core\%s',
+            ],
+            [
+                [null, 'output'],
+                '%s',
+            ],
+        ];
+    }
+
     /**
      * Data provider for classloader test
      */

From 22e4cc9204fee87309eda654141b5627d331fa45 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Wed, 20 Mar 2024 14:13:28 +0000
Subject: [PATCH 05/75] MDL-81301 quiz: improve performance of deleting a quiz

---
 mod/quiz/lib.php            | 26 +++++++++++++-------------
 mod/quiz/tests/lib_test.php | 18 ++++++++++--------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index 36a613b7aa439..db6b8294e5d8c 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -2434,24 +2434,24 @@ function mod_quiz_core_calendar_get_event_action_string(string $eventtype): stri
 }
 
 /**
- * Delete question reference data.
+ * Delete all question references for a quiz.
  *
  * @param int $quizid The id of quiz.
  */
 function quiz_delete_references($quizid): void {
     global $DB;
-    $slots = $DB->get_records('quiz_slots', ['quizid' => $quizid]);
-    foreach ($slots as $slot) {
-        $params = [
-            'itemid' => $slot->id,
-            'component' => 'mod_quiz',
-            'questionarea' => 'slot'
-        ];
-        // Delete any set references.
-        $DB->delete_records('question_set_references', $params);
-        // Delete any references.
-        $DB->delete_records('question_references', $params);
-    }
+
+    $cm = get_coursemodule_from_instance('quiz', $quizid);
+    $context = context_module::instance($cm->id);
+
+    $conditions = [
+        'usingcontextid' => $context->id,
+        'component' => 'mod_quiz',
+        'questionarea' => 'slot',
+    ];
+
+    $DB->delete_records('question_references', $conditions);
+    $DB->delete_records('question_set_references', $conditions);
 }
 
 /**
diff --git a/mod/quiz/tests/lib_test.php b/mod/quiz/tests/lib_test.php
index 7a8bf4214081c..4b0536b4a487e 100644
--- a/mod/quiz/tests/lib_test.php
+++ b/mod/quiz/tests/lib_test.php
@@ -24,6 +24,7 @@
  */
 namespace mod_quiz;
 
+use context_module;
 use core_external\external_api;
 use mod_quiz\quiz_settings;
 
@@ -106,6 +107,7 @@ public function test_quiz_delete_instance() {
         // Setup a quiz with 1 standard and 1 random question.
         $quizgenerator = $this->getDataGenerator()->get_plugin_generator('mod_quiz');
         $quiz = $quizgenerator->create_instance(['course' => $SITE->id, 'questionsperpage' => 3, 'grade' => 100.0]);
+        $context = context_module::instance($quiz->cmid);
 
         $questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
         $cat = $questiongenerator->create_question_category();
@@ -121,20 +123,20 @@ public function test_quiz_delete_instance() {
 
         // Check that the random question was deleted.
         if ($randomq) {
-            $count = $DB->count_records('question', ['id' => $randomq->id]);
-            $this->assertEquals(0, $count);
+            $this->assertEquals(0, $DB->count_records('question', ['id' => $randomq->id]));
         }
         // Check that the standard question was not deleted.
-        $count = $DB->count_records('question', ['id' => $standardq->id]);
-        $this->assertEquals(1, $count);
+        $this->assertEquals(1, $DB->count_records('question', ['id' => $standardq->id]));
 
         // Check that all the slots were removed.
-        $count = $DB->count_records('quiz_slots', ['quizid' => $quiz->id]);
-        $this->assertEquals(0, $count);
+        $this->assertEquals(0, $DB->count_records('quiz_slots', ['quizid' => $quiz->id]));
 
         // Check that the quiz was removed.
-        $count = $DB->count_records('quiz', ['id' => $quiz->id]);
-        $this->assertEquals(0, $count);
+        $this->assertEquals(0, $DB->count_records('quiz', ['id' => $quiz->id]));
+
+        // Check that any question references linked to this quiz are gone.
+        $this->assertEquals(0, $DB->count_records('question_references', ['usingcontextid' => $context->id]));
+        $this->assertEquals(0, $DB->count_records('question_set_references', ['usingcontextid' => $context->id]));
     }
 
     public function test_quiz_get_user_attempts() {

From c550ef8dcbfd179028d3315233c3401c3fcb0c2c Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Wed, 17 Apr 2024 11:09:53 +0100
Subject: [PATCH 06/75] MDL-81578 user: disable form change checker for bulk
 user actions.

When bulk user actions are used from the "Browse users" report.
---
 admin/user/user_bulk_forms.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/admin/user/user_bulk_forms.php b/admin/user/user_bulk_forms.php
index 1a1604e225a51..62c4814fc7960 100644
--- a/admin/user/user_bulk_forms.php
+++ b/admin/user/user_bulk_forms.php
@@ -148,6 +148,10 @@ protected function build_actions(): array {
     public function definition() {
         $mform =& $this->_form;
 
+        // Most bulk actions perform a redirect on selection, so we shouldn't trigger formchange warnings (specifically because
+        // the user must have _already_ changed the current form by selecting users to perform the action on).
+        $mform->disable_form_change_checker();
+
         $mform->addElement('hidden', 'returnurl');
         $mform->setType('returnurl', PARAM_LOCALURL);
 

From 3c1b63c7d87c8393e79f2e383ce15291dd10bdcb Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Sat, 20 Apr 2024 20:56:34 +0800
Subject: [PATCH 07/75] MDL-81615 backup: Bump release to 4.5

---
 backup/backup.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backup/backup.class.php b/backup/backup.class.php
index 2107a2829e722..66026f870bd57 100644
--- a/backup/backup.class.php
+++ b/backup/backup.class.php
@@ -160,7 +160,7 @@ abstract class backup implements checksumable {
     /**
      * Usually same than major release zero version, mainly for informative/historic purposes.
      */
-    const RELEASE = '4.4';
+    const RELEASE = '4.5';
 
     /**
      * Cipher to be used in backup and restore operations.

From 78e5814a0f3111cedcb7aa8828faf7dfeed6ca04 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Sat, 20 Apr 2024 21:01:04 +0800
Subject: [PATCH 08/75] MDL-81616 upgrade: add the 4.4.0 separation line to all
 upgrade scripts

---
 admin/tool/cohortroles/db/upgrade.php            | 3 +++
 admin/tool/customlang/db/upgrade.php             | 3 +++
 admin/tool/dataprivacy/db/upgrade.php            | 3 +++
 admin/tool/log/db/upgrade.php                    | 3 +++
 admin/tool/log/store/database/db/upgrade.php     | 3 +++
 admin/tool/log/store/standard/db/upgrade.php     | 3 +++
 admin/tool/mfa/factor/auth/db/upgrade.php        | 3 +++
 admin/tool/mobile/db/upgrade.php                 | 3 +++
 admin/tool/monitor/db/upgrade.php                | 3 +++
 admin/tool/moodlenet/db/upgrade.php              | 3 +++
 admin/tool/policy/db/upgrade.php                 | 3 +++
 admin/tool/usertours/db/upgrade.php              | 3 +++
 auth/cas/db/upgrade.php                          | 3 +++
 auth/db/db/upgrade.php                           | 3 +++
 auth/email/db/upgrade.php                        | 3 +++
 auth/ldap/db/upgrade.php                         | 3 +++
 auth/lti/db/upgrade.php                          | 3 +++
 auth/manual/db/upgrade.php                       | 3 +++
 auth/mnet/db/upgrade.php                         | 3 +++
 auth/none/db/upgrade.php                         | 3 +++
 auth/oauth2/db/upgrade.php                       | 3 +++
 auth/shibboleth/db/upgrade.php                   | 3 +++
 blocks/badges/db/upgrade.php                     | 3 +++
 blocks/calendar_month/db/upgrade.php             | 3 +++
 blocks/calendar_upcoming/db/upgrade.php          | 3 +++
 blocks/completionstatus/db/upgrade.php           | 3 +++
 blocks/course_summary/db/upgrade.php             | 3 +++
 blocks/feedback/db/upgrade.php                   | 3 +++
 blocks/html/db/upgrade.php                       | 3 +++
 blocks/myoverview/db/upgrade.php                 | 3 +++
 blocks/navigation/db/upgrade.php                 | 3 +++
 blocks/recent_activity/db/upgrade.php            | 3 +++
 blocks/recentlyaccesseditems/db/upgrade.php      | 3 +++
 blocks/rss_client/db/upgrade.php                 | 3 +++
 blocks/section_links/db/upgrade.php              | 3 +++
 blocks/selfcompletion/db/upgrade.php             | 3 +++
 blocks/settings/db/upgrade.php                   | 3 +++
 blocks/tag_youtube/db/upgrade.php                | 3 +++
 blocks/timeline/db/upgrade.php                   | 3 +++
 communication/provider/matrix/db/upgrade.php     | 3 +++
 course/format/topics/db/upgrade.php              | 3 +++
 course/format/weeks/db/upgrade.php               | 3 +++
 enrol/database/db/upgrade.php                    | 3 +++
 enrol/flatfile/db/upgrade.php                    | 3 +++
 enrol/guest/db/upgrade.php                       | 3 +++
 enrol/imsenterprise/db/upgrade.php               | 3 +++
 enrol/lti/db/upgrade.php                         | 3 +++
 enrol/manual/db/upgrade.php                      | 3 +++
 enrol/mnet/db/upgrade.php                        | 3 +++
 enrol/paypal/db/upgrade.php                      | 3 +++
 enrol/self/db/upgrade.php                        | 3 +++
 filter/displayh5p/db/upgrade.php                 | 3 +++
 filter/mathjaxloader/db/upgrade.php              | 3 +++
 filter/mediaplugin/db/upgrade.php                | 3 +++
 filter/tex/db/upgrade.php                        | 3 +++
 grade/grading/form/guide/db/upgrade.php          | 3 +++
 grade/grading/form/rubric/db/upgrade.php         | 3 +++
 grade/report/grader/db/upgrade.php               | 3 +++
 grade/report/history/db/upgrade.php              | 3 +++
 grade/report/overview/db/upgrade.php             | 3 +++
 grade/report/user/db/upgrade.php                 | 3 +++
 lib/antivirus/clamav/db/upgrade.php              | 3 +++
 lib/db/upgrade.php                               | 3 +++
 lib/editor/atto/db/upgrade.php                   | 3 +++
 lib/editor/atto/plugins/equation/db/upgrade.php  | 3 +++
 lib/editor/atto/plugins/recordrtc/db/upgrade.php | 3 +++
 media/player/videojs/db/upgrade.php              | 3 +++
 message/output/email/db/upgrade.php              | 3 +++
 message/output/popup/db/upgrade.php              | 3 +++
 mod/assign/db/upgrade.php                        | 3 +++
 mod/assign/feedback/comments/db/upgrade.php      | 3 +++
 mod/assign/feedback/editpdf/db/upgrade.php       | 3 +++
 mod/assign/feedback/file/db/upgrade.php          | 3 +++
 mod/assign/submission/comments/db/upgrade.php    | 3 +++
 mod/assign/submission/file/db/upgrade.php        | 3 +++
 mod/assign/submission/onlinetext/db/upgrade.php  | 3 +++
 mod/bigbluebuttonbn/db/upgrade.php               | 3 +++
 mod/book/db/upgrade.php                          | 3 +++
 mod/chat/db/upgrade.php                          | 3 +++
 mod/choice/db/upgrade.php                        | 3 +++
 mod/data/db/upgrade.php                          | 3 +++
 mod/feedback/db/upgrade.php                      | 3 +++
 mod/folder/db/upgrade.php                        | 3 +++
 mod/forum/db/upgrade.php                         | 3 +++
 mod/glossary/db/upgrade.php                      | 3 +++
 mod/h5pactivity/db/upgrade.php                   | 3 +++
 mod/imscp/db/upgrade.php                         | 3 +++
 mod/label/db/upgrade.php                         | 3 +++
 mod/lesson/db/upgrade.php                        | 3 +++
 mod/lti/db/upgrade.php                           | 3 +++
 mod/lti/service/gradebookservices/db/upgrade.php | 3 +++
 mod/page/db/upgrade.php                          | 3 +++
 mod/quiz/accessrule/seb/db/upgrade.php           | 3 +++
 mod/quiz/db/upgrade.php                          | 3 +++
 mod/quiz/report/overview/db/upgrade.php          | 3 +++
 mod/quiz/report/statistics/db/upgrade.php        | 3 +++
 mod/resource/db/upgrade.php                      | 3 +++
 mod/scorm/db/upgrade.php                         | 3 +++
 mod/survey/db/upgrade.php                        | 3 +++
 mod/url/db/upgrade.php                           | 3 +++
 mod/wiki/db/upgrade.php                          | 3 +++
 mod/workshop/db/upgrade.php                      | 3 +++
 mod/workshop/form/accumulative/db/upgrade.php    | 3 +++
 mod/workshop/form/comments/db/upgrade.php        | 3 +++
 mod/workshop/form/numerrors/db/upgrade.php       | 3 +++
 mod/workshop/form/rubric/db/upgrade.php          | 3 +++
 payment/gateway/paypal/db/upgrade.php            | 3 +++
 portfolio/googledocs/db/upgrade.php              | 3 +++
 question/behaviour/manualgraded/db/upgrade.php   | 3 +++
 question/type/calculated/db/upgrade.php          | 3 +++
 question/type/calculatedmulti/db/upgrade.php     | 3 +++
 question/type/ddmarker/db/upgrade.php            | 3 +++
 question/type/essay/db/upgrade.php               | 3 +++
 question/type/match/db/upgrade.php               | 3 +++
 question/type/multianswer/db/upgrade.php         | 3 +++
 question/type/multichoice/db/upgrade.php         | 3 +++
 question/type/numerical/db/upgrade.php           | 3 +++
 question/type/ordering/db/upgrade.php            | 3 +++
 question/type/random/db/upgrade.php              | 3 +++
 question/type/randomsamatch/db/upgrade.php       | 3 +++
 question/type/shortanswer/db/upgrade.php         | 3 +++
 question/type/truefalse/db/upgrade.php           | 3 +++
 repository/dropbox/db/upgrade.php                | 3 +++
 repository/flickr/db/upgrade.php                 | 3 +++
 repository/googledocs/db/upgrade.php             | 3 +++
 repository/onedrive/db/upgrade.php               | 3 +++
 search/engine/simpledb/db/upgrade.php            | 3 +++
 127 files changed, 381 insertions(+)

diff --git a/admin/tool/cohortroles/db/upgrade.php b/admin/tool/cohortroles/db/upgrade.php
index b102f5b7a2b1b..ed03dab748f83 100644
--- a/admin/tool/cohortroles/db/upgrade.php
+++ b/admin/tool/cohortroles/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_tool_cohortroles_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/customlang/db/upgrade.php b/admin/tool/customlang/db/upgrade.php
index d9182cf16e3f1..a113e542e15fa 100644
--- a/admin/tool/customlang/db/upgrade.php
+++ b/admin/tool/customlang/db/upgrade.php
@@ -33,5 +33,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/dataprivacy/db/upgrade.php b/admin/tool/dataprivacy/db/upgrade.php
index 935a364e04690..03282262f108c 100644
--- a/admin/tool/dataprivacy/db/upgrade.php
+++ b/admin/tool/dataprivacy/db/upgrade.php
@@ -103,5 +103,8 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/log/db/upgrade.php b/admin/tool/log/db/upgrade.php
index 5420435a18ee9..4c963a947df99 100644
--- a/admin/tool/log/db/upgrade.php
+++ b/admin/tool/log/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_tool_log_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/log/store/database/db/upgrade.php b/admin/tool/log/store/database/db/upgrade.php
index bcc48974d653d..ba70293c25645 100644
--- a/admin/tool/log/store/database/db/upgrade.php
+++ b/admin/tool/log/store/database/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/log/store/standard/db/upgrade.php b/admin/tool/log/store/standard/db/upgrade.php
index 1f2d4862554b7..02be2a863e3f2 100644
--- a/admin/tool/log/store/standard/db/upgrade.php
+++ b/admin/tool/log/store/standard/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/mfa/factor/auth/db/upgrade.php b/admin/tool/mfa/factor/auth/db/upgrade.php
index ed8a4bd52e54d..2c4e113767e02 100644
--- a/admin/tool/mfa/factor/auth/db/upgrade.php
+++ b/admin/tool/mfa/factor/auth/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_factor_auth_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/mobile/db/upgrade.php b/admin/tool/mobile/db/upgrade.php
index f5d3de9dafa69..586565f4e021b 100644
--- a/admin/tool/mobile/db/upgrade.php
+++ b/admin/tool/mobile/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_tool_mobile_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/monitor/db/upgrade.php b/admin/tool/monitor/db/upgrade.php
index 6036e73ea5fe8..a965e3d518880 100644
--- a/admin/tool/monitor/db/upgrade.php
+++ b/admin/tool/monitor/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/moodlenet/db/upgrade.php b/admin/tool/moodlenet/db/upgrade.php
index 649e3df0f9e84..1c0ec164fa4b5 100644
--- a/admin/tool/moodlenet/db/upgrade.php
+++ b/admin/tool/moodlenet/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_tool_moodlenet_upgrade(int $oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/policy/db/upgrade.php b/admin/tool/policy/db/upgrade.php
index dc6e448ba7c74..d509c23eaaa80 100644
--- a/admin/tool/policy/db/upgrade.php
+++ b/admin/tool/policy/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_tool_policy_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/usertours/db/upgrade.php b/admin/tool/usertours/db/upgrade.php
index d0b7b12221847..e6aeceace911c 100644
--- a/admin/tool/usertours/db/upgrade.php
+++ b/admin/tool/usertours/db/upgrade.php
@@ -49,5 +49,8 @@ function xmldb_tool_usertours_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/cas/db/upgrade.php b/auth/cas/db/upgrade.php
index 41bdd4130578d..d48cae169bc61 100644
--- a/auth/cas/db/upgrade.php
+++ b/auth/cas/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_auth_cas_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/db/db/upgrade.php b/auth/db/db/upgrade.php
index eb5b0994cc9d9..4f52f975b5d33 100644
--- a/auth/db/db/upgrade.php
+++ b/auth/db/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_auth_db_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/email/db/upgrade.php b/auth/email/db/upgrade.php
index ec4e562460797..c2916f6b7c907 100644
--- a/auth/email/db/upgrade.php
+++ b/auth/email/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_auth_email_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/ldap/db/upgrade.php b/auth/ldap/db/upgrade.php
index 3e3e0cf225939..7f3180ca2a88d 100644
--- a/auth/ldap/db/upgrade.php
+++ b/auth/ldap/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_auth_ldap_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/lti/db/upgrade.php b/auth/lti/db/upgrade.php
index bce94faf1aac9..963d5b1b5c950 100644
--- a/auth/lti/db/upgrade.php
+++ b/auth/lti/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_auth_lti_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/manual/db/upgrade.php b/auth/manual/db/upgrade.php
index 39d64b74cfdb1..800ba266f41bf 100644
--- a/auth/manual/db/upgrade.php
+++ b/auth/manual/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/mnet/db/upgrade.php b/auth/mnet/db/upgrade.php
index 59430a9c65900..86aa11a7aa211 100644
--- a/auth/mnet/db/upgrade.php
+++ b/auth/mnet/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/none/db/upgrade.php b/auth/none/db/upgrade.php
index e5f98fbbfffdf..bc70e9b4dd4c1 100644
--- a/auth/none/db/upgrade.php
+++ b/auth/none/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_auth_none_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/oauth2/db/upgrade.php b/auth/oauth2/db/upgrade.php
index 9aec2b1b941d3..784aef02a335a 100644
--- a/auth/oauth2/db/upgrade.php
+++ b/auth/oauth2/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_auth_oauth2_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/shibboleth/db/upgrade.php b/auth/shibboleth/db/upgrade.php
index cf9ffd6824a56..3e9110f9921b3 100644
--- a/auth/shibboleth/db/upgrade.php
+++ b/auth/shibboleth/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_auth_shibboleth_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/badges/db/upgrade.php b/blocks/badges/db/upgrade.php
index 5defadbf4a4b1..29018eb29d813 100644
--- a/blocks/badges/db/upgrade.php
+++ b/blocks/badges/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_block_badges_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/calendar_month/db/upgrade.php b/blocks/calendar_month/db/upgrade.php
index d2ccf94793502..b187cc20b62e8 100644
--- a/blocks/calendar_month/db/upgrade.php
+++ b/blocks/calendar_month/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_block_calendar_month_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/calendar_upcoming/db/upgrade.php b/blocks/calendar_upcoming/db/upgrade.php
index 8defbb45d1ade..30751c8660519 100644
--- a/blocks/calendar_upcoming/db/upgrade.php
+++ b/blocks/calendar_upcoming/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_block_calendar_upcoming_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/completionstatus/db/upgrade.php b/blocks/completionstatus/db/upgrade.php
index 70930bd0f4d26..74fd97e0aab76 100644
--- a/blocks/completionstatus/db/upgrade.php
+++ b/blocks/completionstatus/db/upgrade.php
@@ -53,5 +53,8 @@ function xmldb_block_completionstatus_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/course_summary/db/upgrade.php b/blocks/course_summary/db/upgrade.php
index 41473c0dd9663..c101513d62ccd 100644
--- a/blocks/course_summary/db/upgrade.php
+++ b/blocks/course_summary/db/upgrade.php
@@ -53,5 +53,8 @@ function xmldb_block_course_summary_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/feedback/db/upgrade.php b/blocks/feedback/db/upgrade.php
index 93dcaf8c7b7e8..5bd28716c7045 100644
--- a/blocks/feedback/db/upgrade.php
+++ b/blocks/feedback/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_block_feedback_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/html/db/upgrade.php b/blocks/html/db/upgrade.php
index d4637d1cbc23f..96dee284c7b14 100644
--- a/blocks/html/db/upgrade.php
+++ b/blocks/html/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_block_html_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/myoverview/db/upgrade.php b/blocks/myoverview/db/upgrade.php
index c124b7788d8ff..ec9bcafb67ba4 100644
--- a/blocks/myoverview/db/upgrade.php
+++ b/blocks/myoverview/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_block_myoverview_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/navigation/db/upgrade.php b/blocks/navigation/db/upgrade.php
index d0f7187a874ad..f717b87d4fb03 100644
--- a/blocks/navigation/db/upgrade.php
+++ b/blocks/navigation/db/upgrade.php
@@ -60,5 +60,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/recent_activity/db/upgrade.php b/blocks/recent_activity/db/upgrade.php
index cedeeca7caa30..e5bb424956c5e 100644
--- a/blocks/recent_activity/db/upgrade.php
+++ b/blocks/recent_activity/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_block_recent_activity_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/recentlyaccesseditems/db/upgrade.php b/blocks/recentlyaccesseditems/db/upgrade.php
index 2073e881d4866..33c08ffd4cf57 100644
--- a/blocks/recentlyaccesseditems/db/upgrade.php
+++ b/blocks/recentlyaccesseditems/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_block_recentlyaccesseditems_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/rss_client/db/upgrade.php b/blocks/rss_client/db/upgrade.php
index 521b2b834ae77..30fad13d48227 100644
--- a/blocks/rss_client/db/upgrade.php
+++ b/blocks/rss_client/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_block_rss_client_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/section_links/db/upgrade.php b/blocks/section_links/db/upgrade.php
index d177c32048a1c..c1fd28adaca9e 100644
--- a/blocks/section_links/db/upgrade.php
+++ b/blocks/section_links/db/upgrade.php
@@ -54,5 +54,8 @@ function xmldb_block_section_links_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/selfcompletion/db/upgrade.php b/blocks/selfcompletion/db/upgrade.php
index 9fbb61b72aae1..892246bcebd66 100644
--- a/blocks/selfcompletion/db/upgrade.php
+++ b/blocks/selfcompletion/db/upgrade.php
@@ -53,5 +53,8 @@ function xmldb_block_selfcompletion_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/settings/db/upgrade.php b/blocks/settings/db/upgrade.php
index 6c8170dfbc44e..63dc5410e055a 100644
--- a/blocks/settings/db/upgrade.php
+++ b/blocks/settings/db/upgrade.php
@@ -60,5 +60,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/tag_youtube/db/upgrade.php b/blocks/tag_youtube/db/upgrade.php
index fc123c496f98a..12576396d09cc 100644
--- a/blocks/tag_youtube/db/upgrade.php
+++ b/blocks/tag_youtube/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_block_tag_youtube_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/timeline/db/upgrade.php b/blocks/timeline/db/upgrade.php
index 67a6be3dda829..d91f019f04d1e 100644
--- a/blocks/timeline/db/upgrade.php
+++ b/blocks/timeline/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_block_timeline_upgrade($oldversion, $block) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/communication/provider/matrix/db/upgrade.php b/communication/provider/matrix/db/upgrade.php
index b06af8e155b2c..38b4f3fc7bd3e 100644
--- a/communication/provider/matrix/db/upgrade.php
+++ b/communication/provider/matrix/db/upgrade.php
@@ -54,5 +54,8 @@ function xmldb_communication_matrix_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/course/format/topics/db/upgrade.php b/course/format/topics/db/upgrade.php
index 8690e5f38a587..4d6915d21b1d0 100644
--- a/course/format/topics/db/upgrade.php
+++ b/course/format/topics/db/upgrade.php
@@ -69,5 +69,8 @@ function xmldb_format_topics_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2023100901, 'format', 'topics');
     }
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/course/format/weeks/db/upgrade.php b/course/format/weeks/db/upgrade.php
index 4a2e225b715d9..971df63fa067a 100644
--- a/course/format/weeks/db/upgrade.php
+++ b/course/format/weeks/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_format_weeks_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/database/db/upgrade.php b/enrol/database/db/upgrade.php
index f9524cf264bf4..4658d2238dcbb 100644
--- a/enrol/database/db/upgrade.php
+++ b/enrol/database/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_enrol_database_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/flatfile/db/upgrade.php b/enrol/flatfile/db/upgrade.php
index b9183dd95dc55..f27b2656a9b8a 100644
--- a/enrol/flatfile/db/upgrade.php
+++ b/enrol/flatfile/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_enrol_flatfile_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/guest/db/upgrade.php b/enrol/guest/db/upgrade.php
index 11dba17306a85..d1719d14d6476 100644
--- a/enrol/guest/db/upgrade.php
+++ b/enrol/guest/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_enrol_guest_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/imsenterprise/db/upgrade.php b/enrol/imsenterprise/db/upgrade.php
index cd60ea8e3b000..ec9df3a07201c 100644
--- a/enrol/imsenterprise/db/upgrade.php
+++ b/enrol/imsenterprise/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/lti/db/upgrade.php b/enrol/lti/db/upgrade.php
index 81f71013fe137..95f37a8119654 100644
--- a/enrol/lti/db/upgrade.php
+++ b/enrol/lti/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_enrol_lti_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/manual/db/upgrade.php b/enrol/manual/db/upgrade.php
index bfea1cc3a5a41..bb592770f3328 100644
--- a/enrol/manual/db/upgrade.php
+++ b/enrol/manual/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_enrol_manual_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/mnet/db/upgrade.php b/enrol/mnet/db/upgrade.php
index 3b69df6bd6160..da3c7a8406df4 100644
--- a/enrol/mnet/db/upgrade.php
+++ b/enrol/mnet/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_enrol_mnet_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/paypal/db/upgrade.php b/enrol/paypal/db/upgrade.php
index d715fbe791f5f..db601be973dfe 100644
--- a/enrol/paypal/db/upgrade.php
+++ b/enrol/paypal/db/upgrade.php
@@ -50,5 +50,8 @@ function xmldb_enrol_paypal_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/self/db/upgrade.php b/enrol/self/db/upgrade.php
index f8677bd646aa3..73a822a8c7c7c 100644
--- a/enrol/self/db/upgrade.php
+++ b/enrol/self/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_enrol_self_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/filter/displayh5p/db/upgrade.php b/filter/displayh5p/db/upgrade.php
index d9bf449e1acc8..c5da55869bbb4 100644
--- a/filter/displayh5p/db/upgrade.php
+++ b/filter/displayh5p/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_filter_displayh5p_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/filter/mathjaxloader/db/upgrade.php b/filter/mathjaxloader/db/upgrade.php
index 455007064de7e..c2dada9e57686 100644
--- a/filter/mathjaxloader/db/upgrade.php
+++ b/filter/mathjaxloader/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_filter_mathjaxloader_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/filter/mediaplugin/db/upgrade.php b/filter/mediaplugin/db/upgrade.php
index 1ca6b5811b0cf..0a9a1a15bb3f9 100644
--- a/filter/mediaplugin/db/upgrade.php
+++ b/filter/mediaplugin/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/filter/tex/db/upgrade.php b/filter/tex/db/upgrade.php
index 9db1ecd761c2b..12d0647e5055d 100644
--- a/filter/tex/db/upgrade.php
+++ b/filter/tex/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_filter_tex_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/grading/form/guide/db/upgrade.php b/grade/grading/form/guide/db/upgrade.php
index fd45ed63af719..df9b1331e3485 100644
--- a/grade/grading/form/guide/db/upgrade.php
+++ b/grade/grading/form/guide/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_gradingform_guide_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/grading/form/rubric/db/upgrade.php b/grade/grading/form/rubric/db/upgrade.php
index 999296542f6e8..edaa2ddb0495f 100644
--- a/grade/grading/form/rubric/db/upgrade.php
+++ b/grade/grading/form/rubric/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_gradingform_rubric_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/report/grader/db/upgrade.php b/grade/report/grader/db/upgrade.php
index c0af003d6c112..bb1c2b891e6bb 100644
--- a/grade/report/grader/db/upgrade.php
+++ b/grade/report/grader/db/upgrade.php
@@ -77,5 +77,8 @@ function xmldb_gradereport_grader_upgrade(int $oldversion): bool {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/report/history/db/upgrade.php b/grade/report/history/db/upgrade.php
index 26a444ced6bb0..a3909c35fe0b7 100644
--- a/grade/report/history/db/upgrade.php
+++ b/grade/report/history/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_gradereport_history_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/report/overview/db/upgrade.php b/grade/report/overview/db/upgrade.php
index 5df0e8e7b8a6e..16c73681b915a 100644
--- a/grade/report/overview/db/upgrade.php
+++ b/grade/report/overview/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_gradereport_overview_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/report/user/db/upgrade.php b/grade/report/user/db/upgrade.php
index 1cd616c3631ed..977a9f2518f68 100644
--- a/grade/report/user/db/upgrade.php
+++ b/grade/report/user/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_gradereport_user_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/antivirus/clamav/db/upgrade.php b/lib/antivirus/clamav/db/upgrade.php
index 0d7b0d545b373..1ecd63dd951dd 100644
--- a/lib/antivirus/clamav/db/upgrade.php
+++ b/lib/antivirus/clamav/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_antivirus_clamav_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index c7671471f5834..22b4c9bdb8d46 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -1167,5 +1167,8 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2024041200.00);
     }
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/atto/db/upgrade.php b/lib/editor/atto/db/upgrade.php
index fafd77fb6c57a..1c1352e74bde4 100644
--- a/lib/editor/atto/db/upgrade.php
+++ b/lib/editor/atto/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_editor_atto_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/atto/plugins/equation/db/upgrade.php b/lib/editor/atto/plugins/equation/db/upgrade.php
index adf83d5478373..cd834a38cfd3f 100644
--- a/lib/editor/atto/plugins/equation/db/upgrade.php
+++ b/lib/editor/atto/plugins/equation/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_atto_equation_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/atto/plugins/recordrtc/db/upgrade.php b/lib/editor/atto/plugins/recordrtc/db/upgrade.php
index f5c08aba072dd..10d7463819ca5 100644
--- a/lib/editor/atto/plugins/recordrtc/db/upgrade.php
+++ b/lib/editor/atto/plugins/recordrtc/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_atto_recordrtc_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/media/player/videojs/db/upgrade.php b/media/player/videojs/db/upgrade.php
index 4964964f9ebd4..b5d8ae3fef52c 100644
--- a/media/player/videojs/db/upgrade.php
+++ b/media/player/videojs/db/upgrade.php
@@ -58,5 +58,8 @@ function xmldb_media_videojs_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/message/output/email/db/upgrade.php b/message/output/email/db/upgrade.php
index 96a2bd3f9fd01..1a080fcd6c63a 100644
--- a/message/output/email/db/upgrade.php
+++ b/message/output/email/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_message_email_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/message/output/popup/db/upgrade.php b/message/output/popup/db/upgrade.php
index e41d3f76bc28a..dac0a0909d858 100644
--- a/message/output/popup/db/upgrade.php
+++ b/message/output/popup/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_message_popup_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/db/upgrade.php b/mod/assign/db/upgrade.php
index e35248ff86417..1d99bf7f492df 100644
--- a/mod/assign/db/upgrade.php
+++ b/mod/assign/db/upgrade.php
@@ -63,5 +63,8 @@ function xmldb_assign_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2023103000, 'assign');
     }
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/feedback/comments/db/upgrade.php b/mod/assign/feedback/comments/db/upgrade.php
index b77eccb3de4cb..db24c1ec11991 100644
--- a/mod/assign/feedback/comments/db/upgrade.php
+++ b/mod/assign/feedback/comments/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_assignfeedback_comments_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/feedback/editpdf/db/upgrade.php b/mod/assign/feedback/editpdf/db/upgrade.php
index 4ab535ffb9c03..c8a8ee4b60ddc 100644
--- a/mod/assign/feedback/editpdf/db/upgrade.php
+++ b/mod/assign/feedback/editpdf/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_assignfeedback_editpdf_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/feedback/file/db/upgrade.php b/mod/assign/feedback/file/db/upgrade.php
index f9a4e5f2a84c2..64272266c0e81 100644
--- a/mod/assign/feedback/file/db/upgrade.php
+++ b/mod/assign/feedback/file/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_assignfeedback_file_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/submission/comments/db/upgrade.php b/mod/assign/submission/comments/db/upgrade.php
index 9fc6a20c7adc4..e25ebebc63748 100644
--- a/mod/assign/submission/comments/db/upgrade.php
+++ b/mod/assign/submission/comments/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_assignsubmission_comments_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/submission/file/db/upgrade.php b/mod/assign/submission/file/db/upgrade.php
index fcc9be2af6895..610e084dfeccf 100644
--- a/mod/assign/submission/file/db/upgrade.php
+++ b/mod/assign/submission/file/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_assignsubmission_file_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/submission/onlinetext/db/upgrade.php b/mod/assign/submission/onlinetext/db/upgrade.php
index ae0df7a7e2d2b..e83a5de6982f4 100644
--- a/mod/assign/submission/onlinetext/db/upgrade.php
+++ b/mod/assign/submission/onlinetext/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_assignsubmission_onlinetext_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/bigbluebuttonbn/db/upgrade.php b/mod/bigbluebuttonbn/db/upgrade.php
index 0223fa905e82e..7d107c7502903 100644
--- a/mod/bigbluebuttonbn/db/upgrade.php
+++ b/mod/bigbluebuttonbn/db/upgrade.php
@@ -73,6 +73,9 @@ function xmldb_bigbluebuttonbn_upgrade($oldversion = 0) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 
diff --git a/mod/book/db/upgrade.php b/mod/book/db/upgrade.php
index c2b260eb1175f..8ba5706d7539d 100644
--- a/mod/book/db/upgrade.php
+++ b/mod/book/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_book_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/chat/db/upgrade.php b/mod/chat/db/upgrade.php
index e8aaf6d6e8dd4..d9366519db6ab 100644
--- a/mod/chat/db/upgrade.php
+++ b/mod/chat/db/upgrade.php
@@ -32,5 +32,8 @@ function xmldb_chat_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/choice/db/upgrade.php b/mod/choice/db/upgrade.php
index 6de8108176967..249efbfc81688 100644
--- a/mod/choice/db/upgrade.php
+++ b/mod/choice/db/upgrade.php
@@ -49,5 +49,8 @@ function xmldb_choice_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/data/db/upgrade.php b/mod/data/db/upgrade.php
index 32718e31e2e9d..9b90b57aac2fc 100644
--- a/mod/data/db/upgrade.php
+++ b/mod/data/db/upgrade.php
@@ -79,5 +79,8 @@ function xmldb_data_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2023100901, 'data');
     }
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php
index db9af4ae70b01..8f6a5ae665af9 100644
--- a/mod/feedback/db/upgrade.php
+++ b/mod/feedback/db/upgrade.php
@@ -49,5 +49,8 @@ function xmldb_feedback_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/folder/db/upgrade.php b/mod/folder/db/upgrade.php
index 472407fe9a349..695191b3c8963 100644
--- a/mod/folder/db/upgrade.php
+++ b/mod/folder/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_folder_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
index f28b2d2f83c6d..223f14f02ceb7 100644
--- a/mod/forum/db/upgrade.php
+++ b/mod/forum/db/upgrade.php
@@ -61,5 +61,8 @@ function xmldb_forum_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/glossary/db/upgrade.php b/mod/glossary/db/upgrade.php
index a7d93da22cbff..781db646855ad 100644
--- a/mod/glossary/db/upgrade.php
+++ b/mod/glossary/db/upgrade.php
@@ -49,5 +49,8 @@ function xmldb_glossary_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/h5pactivity/db/upgrade.php b/mod/h5pactivity/db/upgrade.php
index 46512f2fc95fb..31b7c7d2ad511 100644
--- a/mod/h5pactivity/db/upgrade.php
+++ b/mod/h5pactivity/db/upgrade.php
@@ -70,5 +70,8 @@ function xmldb_h5pactivity_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/imscp/db/upgrade.php b/mod/imscp/db/upgrade.php
index ceb73199d81d5..6b51ba8f9fcba 100644
--- a/mod/imscp/db/upgrade.php
+++ b/mod/imscp/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_imscp_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/label/db/upgrade.php b/mod/label/db/upgrade.php
index c6edb5550e7c5..e0d32cbe8d272 100644
--- a/mod/label/db/upgrade.php
+++ b/mod/label/db/upgrade.php
@@ -97,5 +97,8 @@ function xmldb_label_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/lesson/db/upgrade.php b/mod/lesson/db/upgrade.php
index 21afebb6ca788..eb412b7fa07de 100644
--- a/mod/lesson/db/upgrade.php
+++ b/mod/lesson/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_lesson_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/lti/db/upgrade.php b/mod/lti/db/upgrade.php
index 01f94cb5f95a9..cd1b205ea35b3 100644
--- a/mod/lti/db/upgrade.php
+++ b/mod/lti/db/upgrade.php
@@ -119,5 +119,8 @@ function xmldb_lti_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/lti/service/gradebookservices/db/upgrade.php b/mod/lti/service/gradebookservices/db/upgrade.php
index 6f811f46bc5ed..a4419f0bf13b5 100644
--- a/mod/lti/service/gradebookservices/db/upgrade.php
+++ b/mod/lti/service/gradebookservices/db/upgrade.php
@@ -62,5 +62,8 @@ function xmldb_ltiservice_gradebookservices_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/page/db/upgrade.php b/mod/page/db/upgrade.php
index 95a862e44e701..1c904d41241cd 100644
--- a/mod/page/db/upgrade.php
+++ b/mod/page/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_page_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/accessrule/seb/db/upgrade.php b/mod/quiz/accessrule/seb/db/upgrade.php
index f6529564f8f69..27ff6254b5a39 100644
--- a/mod/quiz/accessrule/seb/db/upgrade.php
+++ b/mod/quiz/accessrule/seb/db/upgrade.php
@@ -43,5 +43,8 @@ function xmldb_quizaccess_seb_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php
index a296b7020b4da..4748c3ad20011 100644
--- a/mod/quiz/db/upgrade.php
+++ b/mod/quiz/db/upgrade.php
@@ -132,5 +132,8 @@ function xmldb_quiz_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2023112402, 'quiz');
     }
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/report/overview/db/upgrade.php b/mod/quiz/report/overview/db/upgrade.php
index 621d4d9adde1c..b608b162760a5 100644
--- a/mod/quiz/report/overview/db/upgrade.php
+++ b/mod/quiz/report/overview/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_quiz_overview_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/report/statistics/db/upgrade.php b/mod/quiz/report/statistics/db/upgrade.php
index fefbfbaf371eb..0520dc77f292c 100644
--- a/mod/quiz/report/statistics/db/upgrade.php
+++ b/mod/quiz/report/statistics/db/upgrade.php
@@ -35,5 +35,8 @@ function xmldb_quiz_statistics_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/resource/db/upgrade.php b/mod/resource/db/upgrade.php
index 23f7fa45792b9..86281fd990d5e 100644
--- a/mod/resource/db/upgrade.php
+++ b/mod/resource/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_resource_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/scorm/db/upgrade.php b/mod/scorm/db/upgrade.php
index d646aad07933a..41d5c29d4f1f2 100644
--- a/mod/scorm/db/upgrade.php
+++ b/mod/scorm/db/upgrade.php
@@ -190,5 +190,8 @@ function xmldb_scorm_upgrade($oldversion) {
         // Scorm savepoint reached.
         upgrade_mod_savepoint(true, 2023100901, 'scorm');
     }
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/survey/db/upgrade.php b/mod/survey/db/upgrade.php
index cac5ba4010d99..66c138cbba13f 100644
--- a/mod/survey/db/upgrade.php
+++ b/mod/survey/db/upgrade.php
@@ -49,5 +49,8 @@ function xmldb_survey_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/url/db/upgrade.php b/mod/url/db/upgrade.php
index f6d991365a016..21df4b246b6b9 100644
--- a/mod/url/db/upgrade.php
+++ b/mod/url/db/upgrade.php
@@ -62,5 +62,8 @@ function xmldb_url_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2023100901, 'url');
     }
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php
index 9689617ff3712..a9882a7b84f60 100644
--- a/mod/wiki/db/upgrade.php
+++ b/mod/wiki/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_wiki_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/db/upgrade.php b/mod/workshop/db/upgrade.php
index 0888187c5b9fc..f3ce0fbcfb767 100644
--- a/mod/workshop/db/upgrade.php
+++ b/mod/workshop/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_workshop_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/accumulative/db/upgrade.php b/mod/workshop/form/accumulative/db/upgrade.php
index 2eccedd08dd8b..3622bbf214505 100644
--- a/mod/workshop/form/accumulative/db/upgrade.php
+++ b/mod/workshop/form/accumulative/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_workshopform_accumulative_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/comments/db/upgrade.php b/mod/workshop/form/comments/db/upgrade.php
index 75ea0c2027e78..a6e4d35e07d8a 100644
--- a/mod/workshop/form/comments/db/upgrade.php
+++ b/mod/workshop/form/comments/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_workshopform_comments_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/numerrors/db/upgrade.php b/mod/workshop/form/numerrors/db/upgrade.php
index 7d925af09500b..e46a10133c4b9 100644
--- a/mod/workshop/form/numerrors/db/upgrade.php
+++ b/mod/workshop/form/numerrors/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_workshopform_numerrors_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/rubric/db/upgrade.php b/mod/workshop/form/rubric/db/upgrade.php
index 4f14d83542030..30758e445b33d 100644
--- a/mod/workshop/form/rubric/db/upgrade.php
+++ b/mod/workshop/form/rubric/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_workshopform_rubric_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/payment/gateway/paypal/db/upgrade.php b/payment/gateway/paypal/db/upgrade.php
index aa623ec631176..83035a4b95817 100644
--- a/payment/gateway/paypal/db/upgrade.php
+++ b/payment/gateway/paypal/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_paygw_paypal_upgrade(int $oldversion): bool {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/portfolio/googledocs/db/upgrade.php b/portfolio/googledocs/db/upgrade.php
index 152fb172a8360..c058e65a728de 100644
--- a/portfolio/googledocs/db/upgrade.php
+++ b/portfolio/googledocs/db/upgrade.php
@@ -28,5 +28,8 @@ function xmldb_portfolio_googledocs_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/behaviour/manualgraded/db/upgrade.php b/question/behaviour/manualgraded/db/upgrade.php
index 5488a87442d4e..e5174e2c99daf 100644
--- a/question/behaviour/manualgraded/db/upgrade.php
+++ b/question/behaviour/manualgraded/db/upgrade.php
@@ -35,5 +35,8 @@ function xmldb_qbehaviour_manualgraded_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/calculated/db/upgrade.php b/question/type/calculated/db/upgrade.php
index 3a3e941ffd52a..c6ecac95cece6 100644
--- a/question/type/calculated/db/upgrade.php
+++ b/question/type/calculated/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_qtype_calculated_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/calculatedmulti/db/upgrade.php b/question/type/calculatedmulti/db/upgrade.php
index fb2a012643701..23d3566b30661 100644
--- a/question/type/calculatedmulti/db/upgrade.php
+++ b/question/type/calculatedmulti/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_qtype_calculatedmulti_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2024011700, 'qtype', 'calculatedmulti');
     }
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/ddmarker/db/upgrade.php b/question/type/ddmarker/db/upgrade.php
index 6b4b19a47c7da..419249a0059cf 100644
--- a/question/type/ddmarker/db/upgrade.php
+++ b/question/type/ddmarker/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_qtype_ddmarker_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/essay/db/upgrade.php b/question/type/essay/db/upgrade.php
index 2977627f81f53..2100696c0b936 100644
--- a/question/type/essay/db/upgrade.php
+++ b/question/type/essay/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_qtype_essay_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/match/db/upgrade.php b/question/type/match/db/upgrade.php
index e6d54ec1d3927..4935fcf9c0aca 100644
--- a/question/type/match/db/upgrade.php
+++ b/question/type/match/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_qtype_match_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/multianswer/db/upgrade.php b/question/type/multianswer/db/upgrade.php
index 49c4258dfa545..8a9cc9c5e6b3d 100644
--- a/question/type/multianswer/db/upgrade.php
+++ b/question/type/multianswer/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_qtype_multianswer_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/multichoice/db/upgrade.php b/question/type/multichoice/db/upgrade.php
index 3ff8a9e70cda8..7201b091d0105 100644
--- a/question/type/multichoice/db/upgrade.php
+++ b/question/type/multichoice/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_qtype_multichoice_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/numerical/db/upgrade.php b/question/type/numerical/db/upgrade.php
index 0e3dee5a086a3..acaab79b9b826 100644
--- a/question/type/numerical/db/upgrade.php
+++ b/question/type/numerical/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_qtype_numerical_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/ordering/db/upgrade.php b/question/type/ordering/db/upgrade.php
index b263cc7b22b62..e615d9ce5a0c0 100644
--- a/question/type/ordering/db/upgrade.php
+++ b/question/type/ordering/db/upgrade.php
@@ -367,5 +367,8 @@ function xmldb_qtype_ordering_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2024040401, 'qtype', 'ordering');
     }
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/random/db/upgrade.php b/question/type/random/db/upgrade.php
index 625a657d49da6..e3364d60b754e 100644
--- a/question/type/random/db/upgrade.php
+++ b/question/type/random/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_qtype_random_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/randomsamatch/db/upgrade.php b/question/type/randomsamatch/db/upgrade.php
index 57751b367cf72..9ef281ffc93b9 100644
--- a/question/type/randomsamatch/db/upgrade.php
+++ b/question/type/randomsamatch/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_qtype_randomsamatch_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/shortanswer/db/upgrade.php b/question/type/shortanswer/db/upgrade.php
index 6c92a152463c7..6b7cfc05880b3 100644
--- a/question/type/shortanswer/db/upgrade.php
+++ b/question/type/shortanswer/db/upgrade.php
@@ -37,5 +37,8 @@ function xmldb_qtype_shortanswer_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/truefalse/db/upgrade.php b/question/type/truefalse/db/upgrade.php
index b8b7eac8b7ce3..6c158a600cdbc 100644
--- a/question/type/truefalse/db/upgrade.php
+++ b/question/type/truefalse/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_qtype_truefalse_upgrade(int $oldversion): bool {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/dropbox/db/upgrade.php b/repository/dropbox/db/upgrade.php
index 8482a39122c23..806820e725bd3 100644
--- a/repository/dropbox/db/upgrade.php
+++ b/repository/dropbox/db/upgrade.php
@@ -28,5 +28,8 @@ function xmldb_repository_dropbox_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/flickr/db/upgrade.php b/repository/flickr/db/upgrade.php
index 12f4d3dedb146..708a40d805103 100644
--- a/repository/flickr/db/upgrade.php
+++ b/repository/flickr/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_repository_flickr_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/googledocs/db/upgrade.php b/repository/googledocs/db/upgrade.php
index 789a53c9a1c3b..0c7d397162092 100644
--- a/repository/googledocs/db/upgrade.php
+++ b/repository/googledocs/db/upgrade.php
@@ -28,5 +28,8 @@ function xmldb_repository_googledocs_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/onedrive/db/upgrade.php b/repository/onedrive/db/upgrade.php
index 283a29e10dc2a..4171e8d4b9b6a 100644
--- a/repository/onedrive/db/upgrade.php
+++ b/repository/onedrive/db/upgrade.php
@@ -31,5 +31,8 @@ function xmldb_repository_onedrive_upgrade($oldversion) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/search/engine/simpledb/db/upgrade.php b/search/engine/simpledb/db/upgrade.php
index 0ac5d8ffc64ad..ece82aa087ed9 100644
--- a/search/engine/simpledb/db/upgrade.php
+++ b/search/engine/simpledb/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_search_simpledb_upgrade($oldversion = 0) {
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.4.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

From d7df0384650fb4cf8ed9d82d53a9c88c2d925c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Tue, 16 Apr 2024 15:38:10 +0200
Subject: [PATCH 09/75] MDL-81567 mod_quiz: Adopt edit section title pencil
 icons size.

---
 mod/quiz/styles.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
index 0cf4f33774ce0..64d2683b0d098 100644
--- a/mod/quiz/styles.css
+++ b/mod/quiz/styles.css
@@ -559,7 +559,6 @@ table.quizreviewsummary td.cell {
 }
 
 #page-mod-quiz-edit .section-heading .instancesectioncontainer {
-    font-size: 24px;
     display: inline;
 }
 

From 6de045dea02b399731ebfe02da8a0d4aaaf04c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikel=20Mart=C3=ADn?= <mikel@moodle.com>
Date: Mon, 8 Apr 2024 14:21:36 +0200
Subject: [PATCH 10/75] MDL-81460 theme_boost: Fix loading spinner wobbles

---
 .../output/icon_system_fontawesome.php        |  4 ++--
 theme/boost/scss/moodle/core.scss             | 10 ++++----
 theme/boost/scss/moodle/layout.scss           |  4 ++--
 theme/boost/scss/moodle/moodlenet.scss        |  6 ++---
 theme/boost/scss/moodle/tables.scss           |  4 ++--
 theme/boost/style/moodle.css                  | 24 +++++++++----------
 theme/classic/style/moodle.css                | 24 +++++++++----------
 7 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
index 180d15def4001..e5d169047cf5c 100644
--- a/lib/classes/output/icon_system_fontawesome.php
+++ b/lib/classes/output/icon_system_fontawesome.php
@@ -265,8 +265,8 @@ public function get_core_icon_map() {
             'core:i/info' => 'fa-info',
             'core:i/invalid' => 'fa-times text-danger',
             'core:i/item' => 'fa-circle',
-            'core:i/loading' => 'fa-circle-o-notch fa-spin',
-            'core:i/loading_small' => 'fa-circle-o-notch fa-spin',
+            'core:i/loading' => 'fa-circle-o-notch fa-spin fa-sm',
+            'core:i/loading_small' => 'fa-circle-o-notch fa-spin fa-sm',
             'core:i/location' => 'fa-map-marker',
             'core:i/lock' => 'fa-lock',
             'core:i/log' => 'fa-list-alt',
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index fba267b83e80f..12278c2b686be 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -1521,8 +1521,8 @@ audio.mediaplugin_html5audio {
         .icon {
             display: block;
             font-size: 3em;
-            height: 1em;
-            width: 1em;
+            max-height: 3em;
+            max-width: 3em;
         }
     }
     .carousel-item .loading-icon .icon {
@@ -2338,9 +2338,9 @@ $footer-link-color: $bg-inverse-link-color !default;
         transform: translate(-50%, -50%);
 
         .icon {
-            height: 30px;
-            width: 30px;
-            font-size: 30px;
+            max-height: 2em;
+            max-width: 2em;
+            font-size: 2em;
         }
     }
 }
diff --git a/theme/boost/scss/moodle/layout.scss b/theme/boost/scss/moodle/layout.scss
index be9b732959cc8..d00602f86a17b 100644
--- a/theme/boost/scss/moodle/layout.scss
+++ b/theme/boost/scss/moodle/layout.scss
@@ -25,8 +25,8 @@
             top: 40%;
             position: fixed;
             .icon {
-                width: 1em;
-                height: 1em;
+                max-width: 4em;
+                max-height: 4em;
                 font-size: 4em;
             }
         }
diff --git a/theme/boost/scss/moodle/moodlenet.scss b/theme/boost/scss/moodle/moodlenet.scss
index 475d3e000b9b6..c959a9fcdc265 100644
--- a/theme/boost/scss/moodle/moodlenet.scss
+++ b/theme/boost/scss/moodle/moodlenet.scss
@@ -60,9 +60,9 @@
         .moodlenet-share-modal-content {
             .loading-icon {
                 .icon {
-                    width: 60px;
-                    height: 60px;
-                    font-size: 60px;
+                    max-width: 4em;
+                    max-height: 4em;
+                    font-size: 4em;
                 }
             }
 
diff --git a/theme/boost/scss/moodle/tables.scss b/theme/boost/scss/moodle/tables.scss
index 92958d6a946c1..56e01faa15dcd 100644
--- a/theme/boost/scss/moodle/tables.scss
+++ b/theme/boost/scss/moodle/tables.scss
@@ -76,8 +76,8 @@ table {
     left: calc(50% - 1.5rem);
     top: 200px;
     .icon {
-        height: 3rem;
-        width: 3rem;
+        max-height: 3rem;
+        max-width: 3rem;
         font-size: 3rem;
     }
 }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index c4a0d0f28dfc5..efa84f2582eb2 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -24546,8 +24546,8 @@ audio.mediaplugin_html5audio {
 .modchooser .modal-body .loading-icon .icon {
   display: block;
   font-size: 3em;
-  height: 1em;
-  width: 1em;
+  max-height: 3em;
+  max-width: 3em;
 }
 .modchooser .modal-body .carousel-item .loading-icon .icon {
   margin: 1em auto;
@@ -25282,9 +25282,9 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
   transform: translate(-50%, -50%);
 }
 .overlay-icon-container .loading-icon .icon {
-  height: 30px;
-  width: 30px;
-  font-size: 30px;
+  max-height: 2em;
+  max-width: 2em;
+  font-size: 2em;
 }
 
 .w-auto {
@@ -35146,8 +35146,8 @@ table .sticky-column {
   top: 200px;
 }
 .table-dynamic .loading-icon .icon {
-  height: 3rem;
-  width: 3rem;
+  max-height: 3rem;
+  max-width: 3rem;
   font-size: 3rem;
 }
 
@@ -36861,8 +36861,8 @@ span[data-flexitour=container][x-placement=right] div[data-role=arrow]:after, sp
   position: fixed;
 }
 .layout.fullscreen .loading-icon .icon {
-  width: 1em;
-  height: 1em;
+  max-width: 4em;
+  max-height: 4em;
   font-size: 4em;
 }
 
@@ -38637,9 +38637,9 @@ div.editor_atto_toolbar button .icon {
   padding: 1rem;
 }
 .moodlenet-share-dialog .modal-body .moodlenet-share-modal-content .loading-icon .icon {
-  width: 60px;
-  height: 60px;
-  font-size: 60px;
+  max-width: 4em;
+  max-height: 4em;
+  font-size: 4em;
 }
 .moodlenet-share-dialog .modal-body .moodlenet-share-modal-content .moodlenet-circle-status {
   height: 18rem;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index dfd6ff997e024..84231bbec3110 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -24546,8 +24546,8 @@ audio.mediaplugin_html5audio {
 .modchooser .modal-body .loading-icon .icon {
   display: block;
   font-size: 3em;
-  height: 1em;
-  width: 1em;
+  max-height: 3em;
+  max-width: 3em;
 }
 .modchooser .modal-body .carousel-item .loading-icon .icon {
   margin: 1em auto;
@@ -25282,9 +25282,9 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
   transform: translate(-50%, -50%);
 }
 .overlay-icon-container .loading-icon .icon {
-  height: 30px;
-  width: 30px;
-  font-size: 30px;
+  max-height: 2em;
+  max-width: 2em;
+  font-size: 2em;
 }
 
 .w-auto {
@@ -35146,8 +35146,8 @@ table .sticky-column {
   top: 200px;
 }
 .table-dynamic .loading-icon .icon {
-  height: 3rem;
-  width: 3rem;
+  max-height: 3rem;
+  max-width: 3rem;
   font-size: 3rem;
 }
 
@@ -36795,8 +36795,8 @@ span[data-flexitour=container][x-placement=right] div[data-role=arrow]:after, sp
   position: fixed;
 }
 .layout.fullscreen .loading-icon .icon {
-  width: 1em;
-  height: 1em;
+  max-width: 4em;
+  max-height: 4em;
   font-size: 4em;
 }
 
@@ -38571,9 +38571,9 @@ div.editor_atto_toolbar button .icon {
   padding: 1rem;
 }
 .moodlenet-share-dialog .modal-body .moodlenet-share-modal-content .loading-icon .icon {
-  width: 60px;
-  height: 60px;
-  font-size: 60px;
+  max-width: 4em;
+  max-height: 4em;
+  font-size: 4em;
 }
 .moodlenet-share-dialog .modal-body .moodlenet-share-modal-content .moodlenet-circle-status {
   height: 18rem;

From f0e6e5addb889c557fdd57911bb4bf28b3ee7f71 Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Tue, 16 Apr 2024 16:49:19 +0200
Subject: [PATCH 11/75] MDL-81570 tiny_premium: Add missing lang string

---
 lib/editor/tiny/plugins/premium/lang/en/tiny_premium.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/editor/tiny/plugins/premium/lang/en/tiny_premium.php b/lib/editor/tiny/plugins/premium/lang/en/tiny_premium.php
index 917aeda955ef0..f9843b70337ee 100644
--- a/lib/editor/tiny/plugins/premium/lang/en/tiny_premium.php
+++ b/lib/editor/tiny/plugins/premium/lang/en/tiny_premium.php
@@ -28,5 +28,6 @@
 $string['pluginname'] = 'TinyMCE Premium';
 $string['apikey'] = 'API key';
 $string['apikey_desc'] = '<p>Your API key is available on your <a href="https://www.tiny.cloud">Tiny Cloud</a> account page if you have purchased a subscription, or if you are on a free trial.</p><p>See the list of available TinyMCE Premium features for Moodle in the documentation <a href="https://docs.moodle.org/en/TinyMCE_editor">TinyMCE editor</a>.</p>';
+$string['helplinktext'] = 'Premium plugins';
 $string['premium:accesspremium'] = 'Access TinyMCE Premium features';
 $string['privacy:metadata'] = 'The TinyMCE Premium plugin does not store any personal data.';

From 25780157bf0060f853e559ab9b73d0d237cdc8a3 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 18 Apr 2024 16:52:45 +0100
Subject: [PATCH 12/75] MDL-81603 reportbuilder: don't rely on real entity in
 datasource test.

---
 reportbuilder/tests/datasource_test.php | 112 +++++++++++++++---------
 1 file changed, 73 insertions(+), 39 deletions(-)

diff --git a/reportbuilder/tests/datasource_test.php b/reportbuilder/tests/datasource_test.php
index d1168f519baf3..f4057e8f9346c 100644
--- a/reportbuilder/tests/datasource_test.php
+++ b/reportbuilder/tests/datasource_test.php
@@ -28,7 +28,8 @@
 
 use advanced_testcase;
 use core_reportbuilder_generator;
-use core_reportbuilder\local\entities\user;
+use core_reportbuilder\local\entities\base;
+use core_reportbuilder\local\filters\text;
 use core_reportbuilder\local\report\{column, filter};
 use lang_string;
 use ReflectionClass;
@@ -43,7 +44,7 @@
  * @copyright   2023 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class datasource_test extends advanced_testcase {
+final class datasource_test extends advanced_testcase {
 
     /**
      * Data provider for {@see test_add_columns_from_entity}
@@ -52,20 +53,20 @@ class datasource_test extends advanced_testcase {
      */
     public static function add_columns_from_entity_provider(): array {
         return [
-            'All column' => [
+            'All columns' => [
                 [],
                 [],
-                31,
+                4,
             ],
-            'Include columns (picture, fullname, fullnamewithlink, fullnamewithpicture, fullnamewithpicturelink)' => [
-                ['picture', 'fullname*'],
+            'Include columns (first, extra1, extra2)' => [
+                ['first', 'extra*'],
                 [],
-                5,
+                3,
             ],
-            'Exclude columns (picture, fullname, fullnamewithlink, fullnamewithpicture, fullnamewithpicturelink)' => [
+            'Exclude columns (first, extra1, extra2)' => [
                 [],
-                ['picture', 'fullname*'],
-                26,
+                ['first', 'extra*'],
+                1,
             ],
         ];
     }
@@ -89,12 +90,12 @@ public function test_add_columns_from_entity(
         $instance = $this->get_datasource_test_source();
 
         $method = (new ReflectionClass($instance))->getMethod('add_columns_from_entity');
-        $method->invoke($instance, 'user', $include, $exclude);
+        $method->invoke($instance, 'datasource_test_entity', $include, $exclude);
 
-        // Get all our user entity columns.
+        // Get all our entity columns.
         $columns = array_filter(
             $instance->get_columns(),
-            fn(string $columnname) => strpos($columnname, 'user:') === 0,
+            fn(string $columnname) => strpos($columnname, 'datasource_test_entity:') === 0,
             ARRAY_FILTER_USE_KEY,
         );
 
@@ -111,17 +112,17 @@ public static function add_filters_from_entity_provider(): array {
             'All filters' => [
                 [],
                 [],
-                28,
+                4,
             ],
-            'Include filters (department, phone1, phone2)' => [
-                ['department', 'phone*'],
+            'Include filters (first, extra1, extra2)' => [
+                ['first', 'extra*'],
                 [],
                 3,
             ],
-            'Exclude filters (department, phone1, phone2)' => [
+            'Exclude filters (first, extra1, extra2)' => [
                 [],
-                ['department', 'phone*'],
-                25,
+                ['first', 'extra*'],
+                1,
             ],
         ];
     }
@@ -145,12 +146,12 @@ public function test_add_filters_from_entity(
         $instance = $this->get_datasource_test_source();
 
         $method = (new ReflectionClass($instance))->getMethod('add_filters_from_entity');
-        $method->invoke($instance, 'user', $include, $exclude);
+        $method->invoke($instance, 'datasource_test_entity', $include, $exclude);
 
-        // Get all our user entity filters.
+        // Get all our entity filters.
         $filters = array_filter(
             $instance->get_filters(),
-            fn(string $filtername) => strpos($filtername, 'user:') === 0,
+            fn(string $filtername) => strpos($filtername, 'datasource_test_entity:') === 0,
             ARRAY_FILTER_USE_KEY,
         );
 
@@ -167,17 +168,17 @@ public static function add_conditions_from_entity_provider(): array {
             'All conditions' => [
                 [],
                 [],
-                28,
+                4,
             ],
-            'Include conditions (department, phone1, phone2)' => [
-                ['department', 'phone*'],
+            'Include conditions (first, extra1, extra2)' => [
+                ['first', 'extra*'],
                 [],
                 3,
             ],
-            'Exclude conditions (department, phone1, phone2)' => [
+            'Exclude conditions (first, extra1, extra2)' => [
                 [],
-                ['department', 'phone*'],
-                25,
+                ['first', 'extra*'],
+                1,
             ],
         ];
     }
@@ -201,12 +202,12 @@ public function test_add_conditions_from_entity(
         $instance = $this->get_datasource_test_source();
 
         $method = (new ReflectionClass($instance))->getMethod('add_conditions_from_entity');
-        $method->invoke($instance, 'user', $include, $exclude);
+        $method->invoke($instance, 'datasource_test_entity', $include, $exclude);
 
-        // Get all our user entity conditions.
+        // Get all our entity conditions.
         $conditions = array_filter(
             $instance->get_conditions(),
-            fn(string $conditionname) => strpos($conditionname, 'user:') === 0,
+            fn(string $conditionname) => strpos($conditionname, 'datasource_test_entity:') === 0,
             ARRAY_FILTER_USE_KEY,
         );
 
@@ -222,19 +223,19 @@ public function test_add_all_from_entity(): void {
         $instance = $this->get_datasource_test_source();
 
         $method = (new ReflectionClass($instance))->getMethod('add_all_from_entity');
-        $method->invoke($instance, 'user', ['username'], ['firstname'], ['lastname']);
+        $method->invoke($instance, 'datasource_test_entity', ['first'], ['second'], ['extra1']);
 
         // Assert the column we added (plus one we didn't).
-        $this->assertInstanceOf(column::class, $instance->get_column('user:username'));
-        $this->assertNull($instance->get_column('user:email'));
+        $this->assertInstanceOf(column::class, $instance->get_column('datasource_test_entity:first'));
+        $this->assertNull($instance->get_column('datasource_test_entity:second'));
 
         // Assert the filter we added (plus one we didn't).
-        $this->assertInstanceOf(filter::class, $instance->get_filter('user:firstname'));
-        $this->assertNull($instance->get_filter('user:email'));
+        $this->assertInstanceOf(filter::class, $instance->get_filter('datasource_test_entity:second'));
+        $this->assertNull($instance->get_filter('datasource_test_entity:first'));
 
         // Assert the condition we added (plus one we didn't).
-        $this->assertInstanceOf(filter::class, $instance->get_condition('user:lastname'));
-        $this->assertNull($instance->get_condition('user:email'));
+        $this->assertInstanceOf(filter::class, $instance->get_condition('datasource_test_entity:extra1'));
+        $this->assertNull($instance->get_condition('datasource_test_entity:extra2'));
     }
 
     /**
@@ -266,7 +267,7 @@ protected function initialise(): void {
         $this->add_column(new column('test', null, 'dummy'));
 
         // This is the entity from which we'll add our report elements.
-        $this->add_entity(new user());
+        $this->add_entity(new datasource_test_entity());
     }
 
     public static function get_name(): string {
@@ -285,3 +286,36 @@ public function get_default_conditions(): array {
         return [];
     }
 }
+
+/**
+ * Simple implementation of the base entity
+ */
+class datasource_test_entity extends base {
+
+    protected function get_default_tables(): array {
+        return ['course'];
+    }
+
+    protected function get_default_entity_title(): lang_string {
+        return new lang_string('course');
+    }
+
+    /**
+     * We're going to add multiple columns/filters/conditions, each named as following:
+     *
+     * [first, second, extra1, extra2]
+     *
+     * @return base
+     */
+    public function initialise(): base {
+        foreach (['first', 'second', 'extra1', 'extra2'] as $field) {
+            $name = new lang_string('customfieldcolumn', 'core_reportbuilder', $field);
+
+            $this->add_column(new column($field, $name, $this->get_entity_name()));
+            $this->add_filter(new filter(text::class, $field, $name, $this->get_entity_name()));
+            $this->add_condition(new filter(text::class, $field, $name, $this->get_entity_name()));
+        }
+
+        return $this;
+    }
+}

From 7594612fab738afac5a250477a31649ac74462e2 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Tue, 9 Apr 2024 17:52:37 +0100
Subject: [PATCH 13/75] MDL-81274 mod_data: observe current approved value on
 record import.

---
 .../local/importer/csv_entries_importer.php   | 10 ++-
 mod/data/lib.php                              |  6 +-
 mod/data/tests/entries_import_test.php        | 81 ++++++++++++++++---
 .../test_data_import_with_approved.csv        |  3 +
 mod/data/upgrade.txt                          |  3 +
 5 files changed, 89 insertions(+), 14 deletions(-)
 create mode 100644 mod/data/tests/fixtures/test_data_import_with_approved.csv

diff --git a/mod/data/classes/local/importer/csv_entries_importer.php b/mod/data/classes/local/importer/csv_entries_importer.php
index a3b9064d1cad2..6fbc193839fe8 100644
--- a/mod/data/classes/local/importer/csv_entries_importer.php
+++ b/mod/data/classes/local/importer/csv_entries_importer.php
@@ -133,7 +133,15 @@ public function import_csv(stdClass $cm, stdClass $data, string $encoding, strin
                         $authorid = $author->id;
                     }
                 }
-                if ($recordid = data_add_record($data, 0, $authorid)) {  // Add instance to data_record.
+
+                // Determine presence of "approved" field within the record to import.
+                $approved = true;
+                if (array_key_exists(get_string('approved', 'data'), $fieldnames)) {
+                    $approvedindex = $fieldnames[get_string('approved', 'data')];
+                    $approved = !empty($record[$approvedindex]);
+                }
+
+                if ($recordid = data_add_record($data, 0, $authorid, $approved)) { // Add instance to data_record.
                     foreach ($fields as $field) {
                         $fieldid = $fieldnames[$field->field->name];
                         if (isset($record[$fieldid])) {
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 7715a3e4279e7..3bc9676dbe265 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1156,9 +1156,11 @@ function data_numentries($data, $userid=null) {
  * @param object $data
  * @param int $groupid
  * @param int $userid
+ * @param bool $approved If specified, and the user has the capability to approve entries, then this value
+ *      will be used as the approved status of the new record
  * @return bool
  */
-function data_add_record($data, $groupid = 0, $userid = null) {
+function data_add_record($data, $groupid = 0, $userid = null, bool $approved = true) {
     global $USER, $DB;
 
     $cm = get_coursemodule_from_instance('data', $data->id);
@@ -1170,7 +1172,7 @@ function data_add_record($data, $groupid = 0, $userid = null) {
     $record->groupid = $groupid;
     $record->timecreated = $record->timemodified = time();
     if (has_capability('mod/data:approve', $context)) {
-        $record->approved = 1;
+        $record->approved = $approved;
     } else {
         $record->approved = 0;
     }
diff --git a/mod/data/tests/entries_import_test.php b/mod/data/tests/entries_import_test.php
index 66482dcbdde5f..8c2dd51d971a1 100644
--- a/mod/data/tests/entries_import_test.php
+++ b/mod/data/tests/entries_import_test.php
@@ -27,10 +27,12 @@
  *
  * @package    mod_data
  * @category   test
+ * @covers     \mod_data\local\importer\entries_importer
+ * @covers     \mod_data\local\importer\csv_entries_importer
  * @copyright  2019 Tobias Reischmann
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class entries_import_test extends \advanced_testcase {
+final class entries_import_test extends \advanced_testcase {
 
     /**
      * Set up function.
@@ -271,11 +273,74 @@ public function test_import_with_field_username_without_userdata(): void {
     }
 
     /**
-     * Tests the import including files from a zip archive.
+     * Data provider for {@see test_import_without_approved}
+     *
+     * @return array[]
+     */
+    public static function import_without_approved_provider(): array {
+        return [
+            'Teacher can approve entries' => ['teacher', [1, 1]],
+            'Student cannot approve entries' => ['student', [0, 0]],
+        ];
+    }
+
+    /**
+     * Test importing file without approved status column
+     *
+     * @param string $user
+     * @param int[] $expected
+     *
+     * @dataProvider import_without_approved_provider
+     */
+    public function test_import_without_approved(string $user, array $expected): void {
+        $testdata = $this->get_test_data();
+        ['data' => $data, 'cm' => $cm] = $testdata;
+
+        $this->setUser($testdata[$user]);
+
+        $importer = new csv_entries_importer(__DIR__ . '/fixtures/test_data_import.csv', 'test_data_import.csv');
+        $importer->import_csv($cm, $data, 'UTF-8', 'comma');
+
+        $records = $this->get_data_records($data->id);
+        $this->assertEquals($expected, array_column($records, 'approved'));
+    }
+
+    /**
+     * Data provider for {@see test_import_with_approved}
      *
-     * @covers \mod_data\local\importer\entries_importer
-     * @covers \mod_data\local\importer\csv_entries_importer
-     * @return void
+     * @return array[]
+     */
+    public static function import_with_approved_provider(): array {
+        return [
+            'Teacher can approve entries' => ['teacher', [1, 0]],
+            'Student cannot approve entries' => ['student', [0, 0]],
+        ];
+    }
+
+    /**
+     * Test importing file with approved status column
+     *
+     * @param string $user
+     * @param int[] $expected
+     *
+     * @dataProvider import_with_approved_provider
+     */
+    public function test_import_with_approved(string $user, array $expected): void {
+        $testdata = $this->get_test_data();
+        ['data' => $data, 'cm' => $cm] = $testdata;
+
+        $this->setUser($testdata[$user]);
+
+        $importer = new csv_entries_importer(__DIR__ . '/fixtures/test_data_import_with_approved.csv',
+            'test_data_import_with_approved.csv');
+        $importer->import_csv($cm, $data, 'UTF-8', 'comma');
+
+        $records = $this->get_data_records($data->id);
+        $this->assertEquals($expected, array_column($records, 'approved'));
+    }
+
+    /**
+     * Tests the import including files from a zip archive.
      */
     public function test_import_with_files(): void {
         [
@@ -323,10 +388,6 @@ public function test_import_with_files(): void {
 
     /**
      * Tests the import including files from a zip archive.
-     *
-     * @covers \mod_data\local\importer\entries_importer
-     * @covers \mod_data\local\importer\csv_entries_importer
-     * @return void
      */
     public function test_import_with_files_missing_file(): void {
         [
@@ -377,8 +438,6 @@ private function get_data_records(int $dataid): array {
     /**
      * Tests if the amount of imported records is counted properly.
      *
-     * @covers \mod_data\local\importer\csv_entries_importer::import_csv
-     * @covers \mod_data\local\importer\csv_entries_importer::get_added_records_messages
      * @dataProvider get_added_record_messages_provider
      * @param string $datafilecontent the content of the datafile to test as string
      * @param int $expectedcount the expected count of messages depending on the datafile content
diff --git a/mod/data/tests/fixtures/test_data_import_with_approved.csv b/mod/data/tests/fixtures/test_data_import_with_approved.csv
new file mode 100644
index 0000000000000..4a66bae07e5aa
--- /dev/null
+++ b/mod/data/tests/fixtures/test_data_import_with_approved.csv
@@ -0,0 +1,3 @@
+ID,Param2,Approved
+1,"My first entry",1
+2,"My second entry",0
diff --git a/mod/data/upgrade.txt b/mod/data/upgrade.txt
index 24d03ae0e6091..cb658a91a2301 100644
--- a/mod/data/upgrade.txt
+++ b/mod/data/upgrade.txt
@@ -1,6 +1,9 @@
 This files describes API changes in /mod/data - plugins,
 information provided here is intended especially for developers.
 
+=== 4.5 ===
+* The `data_add_record` method accepts a new `$approved` parameter to set the corresponding state of the new record
+
 === 4.4 ===
 * The following behat steps are now deprecated. Use data generators instead:
   - I add a ":fieldtype" field to ":activityname" database and I fill the form with:

From bbc91d47882e22a8e36cee44cd14475753bcb5e9 Mon Sep 17 00:00:00 2001
From: Daniel Neis Araujo <danielneis@gmail.com>
Date: Fri, 19 Apr 2024 13:19:47 -0300
Subject: [PATCH 14/75] MDL-81613 report_log: fix user fullname export for log
 report

---
 report/log/classes/table_log.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/report/log/classes/table_log.php b/report/log/classes/table_log.php
index d9fd538a0c5cd..06d450fa97d84 100644
--- a/report/log/classes/table_log.php
+++ b/report/log/classes/table_log.php
@@ -191,11 +191,13 @@ public function col_fullnameuser($event) {
 
         } else if ($eventusername) {
             if (empty($this->download)) {
-                $params = array('id' => $event->userid);
+                $params = ['id' => $event->userid];
                 if ($event->courseid) {
                     $params['course'] = $event->courseid;
                 }
                 $username = html_writer::link(new moodle_url('/user/view.php', $params), $eventusername);
+            } else {
+                $username = $eventusername;
             }
         } else {
             $username = '-';

From da5de9e91e4e0bc7bece7a4597a49e4cbc2af3ad Mon Sep 17 00:00:00 2001
From: Angelia Dela Cruz <andelacruz@ubiquitous-tech.com>
Date: Thu, 16 Nov 2023 18:45:38 +0800
Subject: [PATCH 15/75] MDL-80107 gradingform: Behat test for defining marking
 guide

---
 .../tests/behat/define_marking_guide.feature  | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 grade/grading/form/guide/tests/behat/define_marking_guide.feature

diff --git a/grade/grading/form/guide/tests/behat/define_marking_guide.feature b/grade/grading/form/guide/tests/behat/define_marking_guide.feature
new file mode 100644
index 0000000000000..04ccd8b9d76fe
--- /dev/null
+++ b/grade/grading/form/guide/tests/behat/define_marking_guide.feature
@@ -0,0 +1,74 @@
+@gradingform @gradingform_guide
+Feature: Teacher can define a marking guide
+  As a teacher,
+  I should be able to define a marking guide
+
+  Background:
+    Given the following "users" exist:
+      | username | firtname | lastname | email                |
+      | teacher1 | Teacher  | One      | teacher1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+    And the following "activities" exist:
+      | activity | course | name     | advancedgradingmethod_submissions |
+      | assign   | C1     | Assign 1 | guide                             |
+    And I am on the "Course 1" course page logged in as teacher1
+    And I go to "Assign 1" advanced grading definition page
+    And I set the following fields to these values:
+      | Name | Marking guide 1 |
+
+  Scenario: No criterion added to marking guide
+    When I press "Save as draft"
+    # Confirm that criterion parameters are required
+    Then I should see "Criterion name can not be empty"
+    And I should see "Criterion max score can not be empty"
+    # Confirm that marking guide is not saved due to the missing criterion
+    And I should not see "Marking guide 1 Draft"
+    And I should not see "Please note: the advanced grading form is not ready at the moment. Simple grading method will be used until the form has a valid status."
+
+  @javascript
+  Scenario: Marking guide criterion is added to marking guide
+    Given I define the following marking guide:
+      | Criterion name | Description for students           | Description for markers           | Maximum score |
+      | Criteria 1     | Criteria 1 description for student | Criteria 1 description for marker | 70            |
+      | Criteria 2     | Criteria 2 description for student | Criteria 2 description for marker | 30            |
+    # Move Criteria 1 below Criteria 2
+    And I click on "Move down" "button" in the "Criteria 1" "table_row"
+    When I press "Save as draft"
+    And I go to "Assign 1" advanced grading definition page
+    # Confirm that the order of criterion shown matches input -- Criteria 2 is listed before Criteria 1
+    Then "Move down" "button" in the "Criteria 2" "table_row" should be visible
+    And "Move up" "button" in the "Criteria 2" "table_row" should not be visible
+    And "Move up" "button" in the "Criteria 1" "table_row" should be visible
+    And "Move down" "button" in the "Criteria 1" "table_row" should not be visible
+    # Confirm the other information entered were saved
+    And I should see "Criteria 2 description for student" in the "Criteria 2" "table_row"
+    And I should see "Criteria 2 description for marker" in the "Criteria 2" "table_row"
+    And I should see "30" in the "Criteria 2" "table_row"
+    And I should see "Criteria 1 description for student" in the "Criteria 1" "table_row"
+    And I should see "Criteria 1 description for marker" in the "Criteria 1" "table_row"
+    And I should see "70" in the "Criteria 1" "table_row"
+
+  Scenario: Marking guide options and frequently used comment are added to marking guide
+    Given I define the following marking guide:
+      | Criterion name | Description for students           | Description for markers           | Maximum score |
+      | Criteria 1     | Criteria 1 description for student | Criteria 1 description for marker | 50            |
+      | Criteria 2     | Criteria 2 description for student | Criteria 2 description for marker | 50            |
+    # Add frequently used comments and other marking guide options
+    And I define the following frequently used comments:
+      | Comment 1 |
+      | Comment 2 |
+    And I set the following fields to these values:
+      | Show guide definition to students    | 1 |
+      | Show marks per criterion to students | 0 |
+    When I press "Save as draft"
+    And I go to "Assign 1" advanced grading definition page
+    #  Confirm that frequently used comments and marking guide options specified during registration are retained
+    Then I should see "Comment 1"
+    And I should see "Comment 2"
+    And the field "Show guide definition to students" matches value "1"
+    And the field "Show marks per criterion to students" matches value "0"

From 735bef87d230ebede8b26bbebbed52fa4294992e Mon Sep 17 00:00:00 2001
From: ferranrecio <ferran@moodle.com>
Date: Wed, 17 Apr 2024 13:19:49 +0200
Subject: [PATCH 16/75] MDL-81575 core_courseformat: fix interactive section
 visibility badge

---
 .../output/local/content/section/visibility.php     | 10 +++++++++-
 .../format/tests/behat/section_visibility.feature   | 13 +++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/course/format/classes/output/local/content/section/visibility.php b/course/format/classes/output/local/content/section/visibility.php
index 0d0cc6ba3703e..ecac3a61ab0b9 100644
--- a/course/format/classes/output/local/content/section/visibility.php
+++ b/course/format/classes/output/local/content/section/visibility.php
@@ -104,7 +104,15 @@ public function export_for_template(\renderer_base $output): ?stdClass {
     private function get_option_data(string $name, string $action): array {
         $baseurl = course_get_url($this->section->course, $this->section);
         $baseurl->param('sesskey', sesskey());
-        $baseurl->param($action,  $this->section->section);
+        $baseurl->param($name,  $this->section->section);
+
+        // The section page is not yet fully reactive and it needs to use the old non-ajax links.
+        $pagesectionid = $this->format->get_sectionid();
+        if ($this->section->id == $pagesectionid) {
+            $baseurl->param('sectionid', $pagesectionid);
+            $action = '';
+        }
+
         return [
             'description' => get_string("availability_{$name}_help", 'core_courseformat'),
             'icon' => $this->get_icon($name),
diff --git a/course/format/tests/behat/section_visibility.feature b/course/format/tests/behat/section_visibility.feature
index 316f895d11cfe..5574b975ae833 100644
--- a/course/format/tests/behat/section_visibility.feature
+++ b/course/format/tests/behat/section_visibility.feature
@@ -81,3 +81,16 @@ Feature: Varify section visibility interface
     And I log out
     And I am on the "C2" "Course" page logged in as "teacher1"
     And I should see "Hidden from students" in the "Section 1" "section"
+
+  @javascript
+  Scenario: The visibility badge can show a hidden section in a the section page
+    Given I hide section "1"
+    When I am on the "C1 > Section 1" "course > section" page
+    And I click on "Hidden from students" "button" in the "[data-region='sectionbadges']" "css_element"
+    And I should see "Show on course page" in the "[data-region='sectionbadges']" "css_element"
+    And I should see "Hide on course page" in the "[data-region='sectionbadges']" "css_element"
+    And I click on "Show on course page" "link" in the "[data-region='sectionbadges']" "css_element"
+    Then I should not see "Hidden from students" in the "[data-region='sectionbadges']" "css_element"
+    And I open the action menu in "page-header" "region"
+    And I choose "Hide" in the open action menu
+    And I should see "Hidden from students" in the "[data-region='sectionbadges']" "css_element"

From 8e7bd88ce3f9586dfed320cf4cc1d5eea38d6e89 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Tue, 23 Apr 2024 10:53:52 +0100
Subject: [PATCH 17/75] MDL-81627 quiz restore: fix restore of grade item for
 each slot

---
 .../backup/moodle2/restore_quiz_stepslib.php  |  2 +-
 .../backup/restore_quiz_grade_items_test.php  | 45 ++++++++++++-------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/mod/quiz/backup/moodle2/restore_quiz_stepslib.php b/mod/quiz/backup/moodle2/restore_quiz_stepslib.php
index 21833b7fb14b2..fa22cf4cf5f79 100644
--- a/mod/quiz/backup/moodle2/restore_quiz_stepslib.php
+++ b/mod/quiz/backup/moodle2/restore_quiz_stepslib.php
@@ -443,7 +443,7 @@ protected function process_quiz_question_instance($data) {
         }
 
         if (isset($data->quizgradeitemid)) {
-            $data->quizgradeitemid = $this->get_mappingid('quiz_grade_items', $data->quizgradeitemid);
+            $data->quizgradeitemid = $this->get_mappingid('quiz_grade_item', $data->quizgradeitemid);
         }
 
         $data->quizid = $this->get_new_parentid('quiz');
diff --git a/mod/quiz/tests/backup/restore_quiz_grade_items_test.php b/mod/quiz/tests/backup/restore_quiz_grade_items_test.php
index 51d8b9176bee9..f3fdc2a6e8fe6 100644
--- a/mod/quiz/tests/backup/restore_quiz_grade_items_test.php
+++ b/mod/quiz/tests/backup/restore_quiz_grade_items_test.php
@@ -16,6 +16,7 @@
 
 namespace mod_quiz;
 
+use core_question_generator;
 use mod_quiz_generator;
 use restore_date_testcase;
 
@@ -39,39 +40,51 @@ public function test_restore_quiz_grade_items(): void {
         global $DB;
         $this->resetAfterTest();
 
-        $course = $this->getDataGenerator()->create_course();
+        $generator = $this->getDataGenerator();
         /** @var mod_quiz_generator $quizgen */
         $quizgen = $this->getDataGenerator()->get_plugin_generator('mod_quiz');
+        /** @var core_question_generator $questiongenerator */
+        $questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
+
+        // Create a quiz with two grade items.
+        $course = $generator->create_course();
         $quiz = $quizgen->create_instance(['course' => $course->id]);
+        $listeninggrade = $quizgen->create_grade_item(['quizid' => $quiz->id, 'name' => 'Listening']);
+        $readinggrade = $quizgen->create_grade_item(['quizid' => $quiz->id, 'name' => 'Reading']);
+
+        // Add two questions to the quiz.
+        $cat = $questiongenerator->create_question_category();
+        $saq1 = $questiongenerator->create_question('shortanswer', null, ['category' => $cat->id]);
+        $saq2 = $questiongenerator->create_question('shortanswer', null, ['category' => $cat->id]);
+        quiz_add_quiz_question($saq1->id, $quiz, 0, 1);
+        quiz_add_quiz_question($saq2->id, $quiz, 0, 1);
 
-        $quizgen->create_grade_item(['quizid' => $quiz->id, 'name' => 'Listening']);
-        $quizgen->create_grade_item(['quizid' => $quiz->id, 'name' => 'Reading']);
+        // Set one of the question to use a grade item.
+        $quizobj = quiz_settings::create($quiz->id);
+        $structure = $quizobj->get_structure();
+        $structure->update_slot_grade_item($structure->get_slot_by_number(2), $readinggrade->id);
+        $quizobj->get_grade_calculator()->recompute_quiz_sumgrades();
 
-        // Back up and restore including group info and user info.
+        // Back up and restore the course.
         $newcourseid = $this->backup_and_restore($course);
 
+        // Verify the grade items were copied over.
         $newquiz = $DB->get_record('quiz', ['course' => $newcourseid]);
         $quizobj = quiz_settings::create($newquiz->id);
         $structure = $quizobj->get_structure();
         $quizgradeitems = array_values($structure->get_grade_items());
 
-        // Strip out the ids, since we don't care what those will be.
-        $quizgradeitems = array_map(
-            function ($quizgradeitem) {
-                unset($quizgradeitem->id);
-                return $quizgradeitem;
-            },
-            $quizgradeitems
-        );
-
         // Check the grade items are right in the restored quiz.
         $this->assertEquals(
             [
-                (object) ['quizid' => $newquiz->id, 'sortorder' => 1, 'name' => 'Listening'],
-                (object) ['quizid' => $newquiz->id, 'sortorder' => 2, 'name' => 'Reading'],
+                (object) ['id' => reset($quizgradeitems)->id, 'quizid' => $newquiz->id, 'sortorder' => 1, 'name' => 'Listening'],
+                (object) ['id' => end($quizgradeitems)->id, 'quizid' => $newquiz->id, 'sortorder' => 2, 'name' => 'Reading'],
             ],
-            $quizgradeitems
+            array_values($quizgradeitems),
         );
 
+        // Verify that each slot uses the right grade item.
+        $this->assertNull($structure->get_slot_by_number(1)->quizgradeitemid);
+        $this->assertEquals(end($quizgradeitems)->id, $structure->get_slot_by_number(2)->quizgradeitemid);
     }
 }

From 93bf8539ca6e40d1b1ad194a307ffd3742b9a454 Mon Sep 17 00:00:00 2001
From: Amaia Anabitarte <amaia@moodle.com>
Date: Tue, 23 Apr 2024 16:08:03 +0200
Subject: [PATCH 18/75] MDL-78433 course: Remove duplicated course search form

---
 course/search.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/course/search.php b/course/search.php
index f0d9d62561403..2b45b1d96c5f8 100644
--- a/course/search.php
+++ b/course/search.php
@@ -94,10 +94,8 @@
     if ((can_edit_in_category() || !empty($usercatlist))) {
         $aurl = new moodle_url('/course/management.php', $searchcriteria);
         $searchform = $OUTPUT->single_button($aurl, get_string('managecourses'), 'get');
-    } else {
-        $searchform = $courserenderer->course_search_form($search);
+        $PAGE->set_button($searchform);
     }
-    $PAGE->set_button($searchform);
 
     // Trigger event, courses searched.
     $eventparams = array('context' => $PAGE->context, 'other' => array('query' => $search));

From 676d7644526d100e12ef57c807a08c076c763ade Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Tue, 23 Apr 2024 18:25:04 +0100
Subject: [PATCH 19/75] MDL-81641 question: fix random question loader draft
 state tests

---
 .../tests/random_question_loader_test.php     | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/question/tests/random_question_loader_test.php b/question/tests/random_question_loader_test.php
index a977bbbae9d08..33b05269690ce 100644
--- a/question/tests/random_question_loader_test.php
+++ b/question/tests/random_question_loader_test.php
@@ -133,12 +133,10 @@ public function test_draft_questions_not_returned(): void {
 
         // Try to a random question from that category - should not be one.
         $filtercondition = [
-            'filter' => [
-                'category' => [
-                    'jointype' => condition::JOINTYPE_DEFAULT,
-                    'values' => [$category->id],
-                    'filteroptions' => ['includesubcategories' => false],
-                ],
+            'category' => [
+                'jointype' => condition::JOINTYPE_DEFAULT,
+                'values' => [$category->id],
+                'filteroptions' => ['includesubcategories' => false],
             ],
         ];
         $loader = new random_question_loader(new qubaid_list([]));
@@ -160,12 +158,10 @@ public function test_questions_with_later_draft_version_is_returned(): void {
 
         // Try to a random question from that category - should get V1.
         $filtercondition = [
-            'filter' => [
-                'category' => [
-                    'jointype' => condition::JOINTYPE_DEFAULT,
-                    'values' => [$category->id],
-                    'filteroptions' => ['includesubcategories' => false],
-                ],
+            'category' => [
+                'jointype' => condition::JOINTYPE_DEFAULT,
+                'values' => [$category->id],
+                'filteroptions' => ['includesubcategories' => false],
             ],
         ];
         $loader = new random_question_loader(new qubaid_list([]));

From 029db9dd4c00cf7e8f358c6bfb05735996d5013e Mon Sep 17 00:00:00 2001
From: Laurent David <lmedavid@gmail.com>
Date: Tue, 16 Apr 2024 14:22:03 +0200
Subject: [PATCH 20/75] MDL-81564 mod_data: Remove duplicate error messages

* When a field is missing the error is duplicated for all field
subsequently added to the database
---
 mod/data/field.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/data/field.php b/mod/data/field.php
index 171e4aa055b0c..d8c66abc2f104 100644
--- a/mod/data/field.php
+++ b/mod/data/field.php
@@ -417,9 +417,9 @@
             $OUTPUT->render_from_template('core/action_menu', $actionmenutemplate)
         ];
 
-        if (!empty($missingfieldtypes)) {
-            echo $OUTPUT->notification(get_string('missingfieldtypes', 'data') . html_writer::alist($missingfieldtypes));
-        }
+    }
+    if (!empty($missingfieldtypes)) {
+        echo $OUTPUT->notification(get_string('missingfieldtypes', 'data') . html_writer::alist($missingfieldtypes));
     }
     echo html_writer::table($table);
 

From b99760a3fb2ce17525c6ca3c4d6460fe90bf52c9 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 25 Mar 2024 17:07:01 +0800
Subject: [PATCH 21/75] MDL-81345 core: Remove unused library

---
 lib/womenslib.php | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 lib/womenslib.php

diff --git a/lib/womenslib.php b/lib/womenslib.php
deleted file mode 100644
index e577d94c0bb02..0000000000000
--- a/lib/womenslib.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * @package   moodlecore
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-/** Include config.pgp */
-include('../config.php');
-
-$PAGE->set_url('/lib/womenslib.php');
-
-redirect('http://en.wikipedia.org/wiki/Women%27s_liberation');
\ No newline at end of file

From eb36f078d817932c95983bf78ef47f803208a5fe Mon Sep 17 00:00:00 2001
From: Angelia Dela Cruz <andelacruz@ubiquitous-tech.com>
Date: Fri, 5 May 2023 17:40:27 +0800
Subject: [PATCH 22/75] MDL-77445 Behat: Coverage for activity chooser
 navigation

---
 course/tests/behat/activity_chooser.feature | 95 +++++++++++++++++++--
 1 file changed, 88 insertions(+), 7 deletions(-)

diff --git a/course/tests/behat/activity_chooser.feature b/course/tests/behat/activity_chooser.feature
index d73dcd07c91df..1d099e6fde8ac 100644
--- a/course/tests/behat/activity_chooser.feature
+++ b/course/tests/behat/activity_chooser.feature
@@ -8,14 +8,14 @@ Feature: Display and choose from the available activities in course
     Given the following "users" exist:
       | username | firstname | lastname | email |
       | teacher | Teacher | 1 | teacher@example.com |
-    And the following "course" exists:
-      | fullname    | Course |
-      | shortname   | C      |
-      | format      | topics |
-      | numsections | 1      |
+    And the following "courses" exist:
+      | fullname | shortname | format | startdate |
+      | Course   | C         | topics |           |
+      | Course 2 | C2        | weeks  | 95713920  |
     And the following "course enrolments" exist:
-      | user | course | role |
-      | teacher | C | editingteacher |
+      | user    | course | role           |
+      | teacher | C      | editingteacher |
+      | teacher | C2     | editingteacher |
     And the following config values are set as admin:
       | enablemoodlenet | 0 | tool_moodlenet |
     And I log in as "teacher"
@@ -46,6 +46,12 @@ Feature: Display and choose from the available activities in course
     When I click on "Information about the Assignment activity" "button" in the "Add an activity or resource" "dialogue"
     Then I should see "Assignment" in the "help" "core_course > Activity chooser screen"
     And I should see "The assignment activity module enables a teacher to communicate tasks, collect work and provide grades and feedback."
+    # Confirm show summary also works for weekly format course
+    And I am on "C2" course homepage with editing mode on
+    And I click on "Add an activity or resource" "button" in the "13 January - 19 January" "section"
+    And I click on "Information about the Assignment activity" "button" in the "Add an activity or resource" "dialogue"
+    And I should see "Assignment" in the "help" "core_course > Activity chooser screen"
+    And I should see "The assignment activity module enables a teacher to communicate tasks, collect work and provide grades and feedback."
 
   Scenario: Hide summary
     Given I click on "Add an activity or resource" "button" in the "New section" "section"
@@ -57,6 +63,15 @@ Feature: Display and choose from the available activities in course
     And "help" "core_course > Activity chooser screen" should not be visible
     And "Back" "button" should not exist in the "modules" "core_course > Activity chooser screen"
     And I should not see "The assignment activity module enables a teacher to communicate tasks, collect work and provide grades and feedback." in the "Add an activity or resource" "dialogue"
+    # Confirm hide summary also works for weekly format course
+    And I am on "C2" course homepage with editing mode on
+    And I click on "Add an activity or resource" "button" in the "13 January - 19 January" "section"
+    And I click on "Information about the Assignment activity" "button" in the "Add an activity or resource" "dialogue"
+    And I click on "Back" "button" in the "help" "core_course > Activity chooser screen"
+    And "modules" "core_course > Activity chooser screen" should be visible
+    And "help" "core_course > Activity chooser screen" should not be visible
+    And "Back" "button" should not exist in the "modules" "core_course > Activity chooser screen"
+    And I should not see "The assignment activity module enables a teacher to communicate tasks, collect work and provide grades and feedback." in the "Add an activity or resource" "dialogue"
 
   Scenario: View recommended activities
     When I log out
@@ -235,3 +250,69 @@ Feature: Display and choose from the available activities in course
     And I reload the page
     And I click on "Add an activity or resource" "button" in the "New section" "section"
     And "Recommended" "link" should appear before "Activities" "link" in the "Add an activity or resource" "dialogue"
+
+  Scenario: Teacher can navigate through activity chooser in Topics format course
+    When I click on "Add an activity or resource" "button" in the "New section" "section"
+    Then I should see "All" in the "Add an activity or resource" "dialogue"
+    And I press the tab key
+    And I press the tab key
+    And I press the tab key
+    And I press the tab key
+    # Confirm right key works
+    And I press the right key
+    And I press the right key
+    And the focused element is "Choice" "menuitem" in the "Add an activity or resource" "dialogue"
+    # Confirm left key works
+    And I press the left key
+    And the focused element is "Book" "menuitem" in the "Add an activity or resource" "dialogue"
+    # Confirm clicking "x" button closes modal
+    And I click on "Close" "button" in the "Add an activity or resource" "dialogue"
+    And "Add an activity or resource" "dialogue" should not be visible
+    And I click on "Add an activity or resource" "button" in the "New section" "section"
+    # Confirm escape key closes the modal
+    And I press the escape key
+    And "Add an activity or resource" "dialogue" should not be visible
+
+  Scenario: Teacher can navigate through activity chooser in Weekly format course
+    Given I am on "C2" course homepage with editing mode on
+    When I click on "Add an activity or resource" "button" in the "13 January - 19 January" "section"
+    Then I should see "All" in the "Add an activity or resource" "dialogue"
+    And I press the tab key
+    And I press the tab key
+    And I press the tab key
+    And I press the tab key
+    # Confirm right key works
+    And I press the right key
+    And I press the right key
+    And the focused element is "Choice" "menuitem" in the "Add an activity or resource" "dialogue"
+    # Confirm left key works
+    And I press the left key
+    And the focused element is "Book" "menuitem" in the "Add an activity or resource" "dialogue"
+    # Confirm clicking "x" button closes modal
+    And I click on "Close" "button" in the "Add an activity or resource" "dialogue"
+    And "Add an activity or resource" "dialogue" should not be visible
+    And I click on "Add an activity or resource" "button" in the "13 January - 19 January" "section"
+    # Confirm escape key closes the modal
+    And I press the escape key
+    And "Add an activity or resource" "dialogue" should not be visible
+
+  Scenario: Teacher can access 'More help' from activity information in activity chooser
+    Given I click on "Add an activity or resource" "button" in the "New section" "section"
+    When I click on "Information about the Assignment activity" "button" in the "Add an activity or resource" "dialogue"
+    # Confirm more help link exists
+    Then "More help" "link" should exist
+    # Confirm that corresponding help icon exist
+    And ".iconhelp" "css_element" should exist
+    # Confirm that link opens in new window
+    And "Opens in new window" "link" should be visible
+    # Confirm the same behaviour for weekly format course
+    And I am on "C2" course homepage with editing mode on
+    And I click on "Add an activity or resource" "button" in the "13 January - 19 January" "section"
+    And I should see "All" in the "Add an activity or resource" "dialogue"
+    And I click on "Information about the Assignment activity" "button" in the "Add an activity or resource" "dialogue"
+    # Confirm more help link exists
+    And "More help" "link" should exist
+    # Confirm that corresponding help icon exist
+    And ".iconhelp" "css_element" should exist
+    # Confirm that link opens in new window
+    And "Opens in new window" "link" should be visible

From 7c5cc9f1405b239eb536810037bae126b16854fd Mon Sep 17 00:00:00 2001
From: Angelia Dela Cruz <andelacruz@ubiquitous-tech.com>
Date: Thu, 27 Apr 2023 17:39:57 +0800
Subject: [PATCH 23/75] MDL-77998 Behat: Add behat coverage for preferences
 navigation

---
 my/tests/behat/preferences_navigation.feature | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 my/tests/behat/preferences_navigation.feature

diff --git a/my/tests/behat/preferences_navigation.feature b/my/tests/behat/preferences_navigation.feature
new file mode 100644
index 0000000000000..102b8971a9559
--- /dev/null
+++ b/my/tests/behat/preferences_navigation.feature
@@ -0,0 +1,106 @@
+@core @core_my @javascript
+Feature: Navigate and use preferences page
+  In order to navigate through preferences page
+  As a user
+  I need to be able to use preferences page
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email          |
+      | student1 | Sam       | Student  | s1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | format |
+      | Course 1 | C1        | topics |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | student1 | C1     | student        |
+    And I log in as "admin"
+
+  Scenario Outline: Navigating through user menu Preferences
+    When I follow "Preferences" in the user menu
+    # Click each link in the 'Preferences' page.
+    And I click on "<userprefpage>" "link" in the "#page-content" "css_element"
+    # Confirm that each redirected page has 'Preferences' in the breadcrumbs.
+    And "Users" "link" should not exist in the ".breadcrumb" "css_element"
+    Then "Preferences" "link" should exist in the ".breadcrumb" "css_element"
+    # Additional confirmation that breadcrumbs is correct.
+    And "<userprefpage>" "text" should exist in the ".breadcrumb" "css_element"
+    # Confirm that user name and profile picture are displayed in header section.
+    And I should see "Admin User" in the ".page-header-headings" "css_element"
+    And ".page-header-image" "css_element" should exist in the "#page-header" "css_element"
+
+    Examples:
+      | userprefpage                 |
+      | Edit profile                 |
+      | Change password              |
+      | Preferred language           |
+      | Forum preferences            |
+      | Editor preferences           |
+      | Calendar preferences         |
+      | Content bank preferences     |
+      | Message preferences          |
+      | Notification preferences     |
+      | Manage badges                |
+      | Badge preferences            |
+      | Backpack settings            |
+      | This user's role assignments |
+      | Permissions                  |
+      | Check permissions            |
+      | Blog preferences             |
+      | External blogs               |
+      | Register an external blog    |
+
+  Scenario Outline: Navigating through course participant preferences
+    Given I am on "Course 1" course homepage
+    And I navigate to course participants
+    And I follow "Sam Student"
+    When I click on "Preferences" "link" in the "#region-main-box" "css_element"
+    Then I should see "Sam Student" in the ".page-header-headings" "css_element"
+    And ".page-header-image" "css_element" should exist in the "#page-header" "css_element"
+    # Click each link in the 'Preferences' page.
+    And I click on "<courseprefpage>" "link" in the "#page-content" "css_element"
+    # Confirm that each redirected page has 'Users/{user}/Preferences' in the breadcrumbs.
+    Then "Users" "link" should exist in the ".breadcrumb" "css_element"
+    And "Sam Student" "link" should exist in the ".breadcrumb" "css_element"
+    And "Preferences" "link" should exist in the ".breadcrumb" "css_element"
+    # Additional confirmation that breadcrumbs is correct.
+    And "<courseprefpage>" "text" should exist in the ".breadcrumb" "css_element"
+    # Confirm that user name and profile picture are displayed in header section.
+    And I should see "Sam Student" in the ".page-header-headings" "css_element"
+    And ".page-header-image" "css_element" should exist in the "#page-header" "css_element"
+
+    Examples:
+      | courseprefpage               |
+      | Edit profile                 |
+      | Preferred language           |
+      | Forum preferences            |
+      | Editor preferences           |
+      | Calendar preferences         |
+      | Content bank preferences     |
+      | Message preferences          |
+      | Notification preferences     |
+      | This user's role assignments |
+      | Permissions                  |
+      | Check permissions            |
+
+  Scenario: Navigation with Event monitoring enabled
+    Given I navigate to "Reports > Event monitoring rules" in site administration
+    And I click on "Enable" "link"
+    And I press "Add a new rule"
+    And I set the following fields to these values:
+      | Rule name       | Testing1            |
+      | Area to monitor | Subsystem (core)    |
+      | Event           | Allow role override |
+    And I press "Save changes"
+    When I follow "Preferences" in the user menu
+    # Confirm that Event monitoring is visible and clickable.
+    Then I should see "Miscellaneous"
+    And I follow "Event monitoring"
+    # Confirm that user can subscribe to new rule.
+    And "Subscribe to rule \"Testing1\"" "link" should exist
+    And I am on "Course 1" course homepage
+    And I navigate to course participants
+    And I follow "Sam Student"
+    And I click on "Preferences" "link" in the "#region-main-box" "css_element"
+    # Confirm that admin cannot change student's event monitor subscription.
+    And I should not see "Event monitoring"

From 0bd601d6ba112f155e924b8858afab14b9ca200e Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Wed, 24 Apr 2024 20:52:32 +0100
Subject: [PATCH 24/75] MDL-81632 block_recentlyaccesseditems: deterministic
 item ordering.

Behat tests of this functionality could trigger the unlikely (in real
world usage) scenario where a user has an identical "timeaccess" value
for multiple course activities.

This led to random failures in said tests when the DB ordered items in
apparently random order, where the "timeaccess" value was equal.
---
 blocks/recentlyaccesseditems/classes/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blocks/recentlyaccesseditems/classes/helper.php b/blocks/recentlyaccesseditems/classes/helper.php
index d1ac05b74baad..61e215ca261a3 100644
--- a/blocks/recentlyaccesseditems/classes/helper.php
+++ b/blocks/recentlyaccesseditems/classes/helper.php
@@ -58,7 +58,7 @@ public static function get_recent_items(int $limit = 0) {
                   FROM {block_recentlyaccesseditems} rai
                   JOIN {course} c ON c.id = rai.courseid
                  WHERE userid = :userid
-                 ORDER BY rai.timeaccess DESC";
+              ORDER BY rai.timeaccess DESC, rai.id DESC";
         $records = $DB->get_records_sql($sql, $paramsql);
         $order = 0;
 

From 61b40e2eaab03b068b25fe60d8c225134a92e0f6 Mon Sep 17 00:00:00 2001
From: AMOS bot <amos@moodle.org>
Date: Thu, 25 Apr 2024 00:12:21 +0000
Subject: [PATCH 25/75] Automatically generated installer lang files

---
 install/lang/pt/install.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/lang/pt/install.php b/install/lang/pt/install.php
index 314f4ce8da30e..b551bb4c06261 100644
--- a/install/lang/pt/install.php
+++ b/install/lang/pt/install.php
@@ -32,7 +32,7 @@
 $string['admindirname'] = 'Pasta de administração';
 $string['availablelangs'] = 'Pacotes linguísticos disponíveis';
 $string['chooselanguagehead'] = 'Selecione um idioma';
-$string['chooselanguagesub'] = 'Selecione o idioma a utilizar durante a instalação. O idioma escolhido será definido como o predefinido mas poderá depois selecionar outro(s) idioma(s) para o site e para os utilizadores.';
+$string['chooselanguagesub'] = 'Selecione o idioma a utilizar durante a instalação. O idioma escolhido será definido como o predefinido, mas poderá depois selecionar outro(s) idioma(s) para o site e para os utilizadores.';
 $string['clialreadyconfigured'] = 'O ficheiro config.php já existe. Use \'admin/cli/install_database.php\' para instalar o Moodle para este site.';
 $string['clialreadyinstalled'] = 'O ficheiro config.php já existe, use admin/cli/install_database.php para atualizar o Moodle para este site.';
 $string['cliinstallheader'] = 'Programa para instalação do Moodle <b>{$a}</b> através da linha de comandos';
@@ -56,9 +56,9 @@
 $string['pathsrodataroot'] = 'A pasta dos dados é só de leitura (não permite escrita).';
 $string['pathsroparentdataroot'] = 'A pasta ascendente <b>{$a->parent}</b> não tem permissões de escrita. O programa de instalação não conseguiu criar a pasta <b>{$a->dataroot}</b>.';
 $string['pathssubadmindir'] = 'Alguns servidores Web utilizam a pasta <strong>admin</strong> em URLs especiais de acesso a funcionalidades especiais, como é o caso de painéis de controlo. Algumas situações podem criar conflitos com a localização normal das páginas de administração do Moodle. Estes problemas podem ser resolvidos renomeando a pasta <strong>admin</strong> na instalação do Moodle e indicando aqui o novo nome a utilizar. Exemplo:<br /><br /><b>moodleadmin</b><br /><br />Esta ação resolverá os problemas de acesso das hiperligações para as funcionalidades de administração do Moodle.';
-$string['pathssubdataroot'] = '<p>Pasta onde o Moodle irá armazenar todo o conteúdo de ficheiros enviados pelos utilizadores.</p>
-<p>O utilizador do Moodle no servidor web (normalmente <b>nobody</b>, <b>apache</b> ou <b>www-data</b>) deve ter permissão de <b>leitura</b> e <b>escrita</b> nessa pasta.
-<p>Não deve ser acessível diretamente através da web.</p>
+$string['pathssubdataroot'] = '<p>Pasta onde o Moodle irá armazenar todo o conteúdo dos ficheiros enviados pelos utilizadores.</p>
+<p>O utilizador do Moodle no servidor web (normalmente <b>nobody</b>, <b>apache</b> ou <b>www-data</b>) deve ter permissão de <b>leitura</b> e de <b>escrita</b> nessa pasta.
+<p>Não pode ser acessível diretamente através da web.</p>
 <p>Se a pasta não existir, o processo de instalação tentará criá-la.</p>';
 $string['pathssubdirroot'] = 'Caminho completo para a pasta que contém o código Moodle.';
 $string['pathssubwwwroot'] = 'Endereço web completo de acesso ao Moodle. Não é possível aceder ao Moodle usando mais do que um endereço. Se o site tiver mais do que um endereço público, devem ser configurados redirecionamentos permanentes em todos eles, à exceção deste. Se o site pode ser acedido a partir da Internet e de Intranet, use o endereço público aqui. Se o endereço atual não está correto, altere o endereço indicado na barra de endereço do seu navegador e reinicie a instalação.';

From 792698af000c3fb598b15f4d048fa76e02fbef50 Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Thu, 25 Apr 2024 15:43:57 +0200
Subject: [PATCH 26/75] weekly on-sync release 4.5dev

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 58172e3efd1e2..b0cc1eaf1ed0e 100644
--- a/version.php
+++ b/version.php
@@ -29,9 +29,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2024042200.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2024042200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
-$release  = '4.5dev (Build: 20240422)'; // Human-friendly version name
+$release  = '4.5dev (Build: 20240425)'; // Human-friendly version name
 $branch   = '405';                     // This version's branch.
 $maturity = MATURITY_ALPHA;             // This version's maturity level.

From 7cc089a4578fad8193fa75603c600e26715fd349 Mon Sep 17 00:00:00 2001
From: Mark Johnson <mark.johnson@catalyst-eu.net>
Date: Wed, 24 Apr 2024 10:33:57 +0100
Subject: [PATCH 27/75] MDL-81611 assign: Close session early in gradingpanel
 fragment

---
 mod/assign/lib.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mod/assign/lib.php b/mod/assign/lib.php
index 7049d8845901c..c0cb2a6e3ef63 100644
--- a/mod/assign/lib.php
+++ b/mod/assign/lib.php
@@ -1400,6 +1400,8 @@ function assign_pluginfile($course,
 function mod_assign_output_fragment_gradingpanel($args) {
     global $CFG;
 
+    \core\session\manager::write_close(); // No changes to session in this function.
+
     $context = $args['context'];
 
     if ($context->contextlevel != CONTEXT_MODULE) {

From c4f840d404e132f31f3a670e0575b729febb0e0c Mon Sep 17 00:00:00 2001
From: SergioComeron <sergiocomeron@icloud.com>
Date: Fri, 5 Apr 2024 16:56:28 +0200
Subject: [PATCH 28/75] MDL-77272 report: Enable module level report options

---
 report/log/lib.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/report/log/lib.php b/report/log/lib.php
index 4d0fbe4b26290..1c6dcf6966b56 100644
--- a/report/log/lib.php
+++ b/report/log/lib.php
@@ -126,8 +126,7 @@ function report_log_can_access_user_report($user, $course) {
 function report_log_extend_navigation_module($navigation, $cm) {
     if (has_capability('report/log:view', context_course::instance($cm->course))) {
         $url = new moodle_url('/report/log/index.php', array('chooselog'=>'1','id'=>$cm->course,'modid'=>$cm->id));
-        $navigation->add(get_string('logs'), $url, navigation_node::TYPE_SETTING, null, 'logreport', new pix_icon('i/report', ''))
-            ->set_show_in_secondary_navigation(false);
+        $navigation->add(get_string('logs'), $url, navigation_node::TYPE_SETTING, null, 'logreport', new pix_icon('i/report', ''));
     }
 }
 

From 82a4c991ef702c6bb4015a467e8d1e22073022fe Mon Sep 17 00:00:00 2001
From: Mark Johnson <mark.johnson@catalyst-eu.net>
Date: Mon, 22 Apr 2024 16:29:37 +0100
Subject: [PATCH 29/75] MDL-81610 course: Optimise
 core_courseformat\external\get_state

core_courseformat\external\get_state calls export_for_tempalte for each
course module, which in turn calls completion_info::is_tracked_user()
for the current user on the current course. The result of this call will
be the same for every course module, so does not need to be called what
may be several hundred times.

This change allows the result of is_tracked_user to be passed to the cm
state object, then calls it once and passes it to each cm's object. If
it is not passed in, it will be computed on demand as before.
---
 course/format/classes/external/get_state.php  |  6 ++-
 .../format/classes/output/local/state/cm.php  | 39 +++++++------------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/course/format/classes/external/get_state.php b/course/format/classes/external/get_state.php
index 76970e0777f93..7e6a2d512e8ff 100644
--- a/course/format/classes/external/get_state.php
+++ b/course/format/classes/external/get_state.php
@@ -60,7 +60,7 @@ public static function execute_parameters(): external_function_parameters {
      * @return string Course state in JSON
      */
     public static function execute(int $courseid): string {
-        global $PAGE, $CFG;
+        global $PAGE, $CFG, $USER;
 
         require_once($CFG->dirroot.'/course/lib.php');
 
@@ -73,6 +73,8 @@ public static function execute(int $courseid): string {
 
         $courseformat = course_get_format($courseid);
         $modinfo = $courseformat->get_modinfo();
+        $completioninfo = new \completion_info(get_course($courseid));
+        $istrackeduser = $completioninfo->is_tracked_user($USER->id);
 
         // Get the proper renderer.
         $renderer = $courseformat->get_renderer($PAGE);
@@ -106,7 +108,7 @@ public static function execute(int $courseid): string {
             if ($cm->is_visible_on_course_page()) {
                 // Only return this course module data if it's visible by current user on the course page.
                 $section = $sections[$cm->sectionnum];
-                $cmstate = new $cmclass($courseformat, $section, $cm);
+                $cmstate = new $cmclass($courseformat, $section, $cm, istrackeduser: $istrackeduser);
                 $result->cm[] = $cmstate->export_for_template($renderer);
             }
         }
diff --git a/course/format/classes/output/local/state/cm.php b/course/format/classes/output/local/state/cm.php
index 2fef3e6870987..84853d4f2adfc 100644
--- a/course/format/classes/output/local/state/cm.php
+++ b/course/format/classes/output/local/state/cm.php
@@ -33,37 +33,26 @@
 /**
  * Contains the ajax update course module structure.
  *
- * @package   core_course
+ * @package   core_courseformat
  * @copyright 2021 Ferran Recio <ferran@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class cm implements renderable {
-
-    /** @var course_format the course format class */
-    protected $format;
-
-    /** @var section_info the course section class */
-    protected $section;
-
-    /** @var bool if cmitem HTML content must be exported as well */
-    protected $exportcontent;
-
-    /** @var cm_info the course module to display */
-    protected $cm;
-
     /**
      * Constructor.
-     *
-     * @param course_format $format the course format
-     * @param section_info $section the section data
-     * @param cm_info $cm the course module data
-     * @param bool $exportcontent = false if pre-rendered cmitem must be exported.
      */
-    public function __construct(course_format $format, section_info $section, cm_info $cm, bool $exportcontent = false) {
-        $this->format = $format;
-        $this->section = $section;
-        $this->cm = $cm;
-        $this->exportcontent = $exportcontent;
+    public function __construct(
+        /** @var course_format $format The course format. */
+        protected course_format $format,
+        /** @var section_info $section The section data. */
+        protected section_info $section,
+        /** @var cm_info $cm The course module data. */
+        protected cm_info $cm,
+        /** @var bool $exportcontent False if pre-rendered cmitem HTML content must be exported. */
+        protected bool $exportcontent = false,
+        /** @var ?bool $istrackeduser If is_tracked_user is pre-computed for this CM's course, it can be provided here. */
+        protected ?bool $istrackeduser = null,
+    ) {
     }
 
     /**
@@ -115,7 +104,7 @@ public function export_for_template(renderer_base $output): stdClass {
 
         // Completion status.
         $completioninfo = new completion_info($course);
-        $data->istrackeduser = $completioninfo->is_tracked_user($USER->id);
+        $data->istrackeduser = $this->istrackeduser ?? $completioninfo->is_tracked_user($USER->id);
         if ($data->istrackeduser && $completioninfo->is_enabled($cm)) {
             $completiondata = $completioninfo->get_data($cm);
             $data->completionstate = $completiondata->completionstate;

From 17237b824da353ba47aa2028b64c1fb986d32eda Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Wed, 17 Apr 2024 16:17:27 +0200
Subject: [PATCH 30/75] MDL-81581 phpunit: Move multiple assert_same_xml() to
 common one

---
 question/engine/tests/helpers.php                   | 13 +++++++++++++
 question/format/xml/tests/xmlformat_test.php        |  5 -----
 question/type/ddwtos/tests/question_type_test.php   |  5 -----
 .../type/gapselect/tests/question_type_test.php     | 11 -----------
 question/type/ordering/tests/questiontype_test.php  | 11 -----------
 5 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/question/engine/tests/helpers.php b/question/engine/tests/helpers.php
index f83d9697a413e..1e4ec1a38d129 100644
--- a/question/engine/tests/helpers.php
+++ b/question/engine/tests/helpers.php
@@ -602,6 +602,19 @@ public function assert_select_options($expectation, $html) {
         }
         return;
     }
+
+    /**
+     * Check that 2 XML strings are the same, ignoring differences in line endings.
+     *
+     * @param string $expectedxml The expected XML string
+     * @param string $xml The XML string to check
+     */
+    public function assert_same_xml($expectedxml, $xml) {
+        $this->assertEquals(
+            str_replace("\r\n", "\n", $expectedxml),
+            str_replace("\r\n", "\n", $xml)
+        );
+    }
 }
 
 
diff --git a/question/format/xml/tests/xmlformat_test.php b/question/format/xml/tests/xmlformat_test.php
index fd8138819c733..7362a1b2295dc 100644
--- a/question/format/xml/tests/xmlformat_test.php
+++ b/question/format/xml/tests/xmlformat_test.php
@@ -47,11 +47,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class xmlformat_test extends \question_testcase {
-    public function assert_same_xml($expectedxml, $xml) {
-        $this->assertEquals(str_replace("\r\n", "\n", $expectedxml),
-                str_replace("\r\n", "\n", $xml));
-    }
-
     public function make_test_question() {
         global $USER;
         $q = new \stdClass();
diff --git a/question/type/ddwtos/tests/question_type_test.php b/question/type/ddwtos/tests/question_type_test.php
index 16de9a09e355f..347bc16926030 100644
--- a/question/type/ddwtos/tests/question_type_test.php
+++ b/question/type/ddwtos/tests/question_type_test.php
@@ -47,11 +47,6 @@ protected function tearDown(): void {
         $this->qtype = null;
     }
 
-    public function assert_same_xml($expectedxml, $xml) {
-        $this->assertEquals(str_replace("\r\n", "\n", $expectedxml),
-                str_replace("\r\n", "\n", $xml));
-    }
-
     /**
      * Get some test question data.
      *
diff --git a/question/type/gapselect/tests/question_type_test.php b/question/type/gapselect/tests/question_type_test.php
index 019542fc56f88..0ad8b3b40aff2 100644
--- a/question/type/gapselect/tests/question_type_test.php
+++ b/question/type/gapselect/tests/question_type_test.php
@@ -46,17 +46,6 @@ protected function tearDown(): void {
         $this->qtype = null;
     }
 
-    /**
-     * Asserts that two strings containing XML are the same ignoring the line-endings.
-     *
-     * @param string $expectedxml
-     * @param string $xml
-     */
-    public function assert_same_xml($expectedxml, $xml) {
-        $this->assertEquals(str_replace("\r\n", "\n", $expectedxml),
-                str_replace("\r\n", "\n", $xml));
-    }
-
     public function test_save_question() {
         $this->resetAfterTest();
 
diff --git a/question/type/ordering/tests/questiontype_test.php b/question/type/ordering/tests/questiontype_test.php
index e9b98b3795fd9..c82f9ee8066ef 100644
--- a/question/type/ordering/tests/questiontype_test.php
+++ b/question/type/ordering/tests/questiontype_test.php
@@ -72,17 +72,6 @@ private static function expectedimport(): object {
         ];
     }
 
-    /**
-     * Asserts that two XML strings are the same, ignoring differences in line endings.
-     *
-     * @param string $expectedxml
-     * @param string $xml
-     */
-    public function assert_same_xml(string $expectedxml, string $xml): void {
-        $this->assertEquals(str_replace("\r\n", "\n", $expectedxml),
-            str_replace("\r\n", "\n", $xml));
-    }
-
     public function test_name(): void {
         $ordering = new qtype_ordering();
         $this->assertEquals('ordering', $ordering->name());

From 71bd82ad6877783e8cf1dcddad6ac817b96b95cd Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Wed, 17 Apr 2024 16:25:45 +0200
Subject: [PATCH 31/75] MDL-81581 phpunit: Create the normalise_line_endings()
 method

And apply it to all the obvious places related with the issue.

Note that surely there are way more in code base, but it's
out of scope for this issue.
---
 lib/phpunit/classes/util.php                           | 10 ++++++++++
 question/engine/tests/helpers.php                      |  4 ++--
 .../xml/tests/qformat_xml_import_export_test.php       |  2 +-
 question/type/ordering/tests/questiontype_test.php     |  6 +++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php
index 22454da39f52e..0e0bb2d1cb678 100644
--- a/lib/phpunit/classes/util.php
+++ b/lib/phpunit/classes/util.php
@@ -990,6 +990,16 @@ protected static function pad(string $string, int $level): string {
         return str_repeat(" ", $level * 2) . "{$string}\n";
     }
 
+    /**
+     * Normalise any text to always use unix line endings (line-feeds).
+     *
+     * @param   string  $text The text to normalize
+     * @return  string
+     */
+    public static function normalise_line_endings(string $text): string {
+        return str_replace(["\r\n", "\r"], "\n", $text);
+    }
+
     /**
      * Get the coverage config for the supplied includelist and excludelist configuration.
      *
diff --git a/question/engine/tests/helpers.php b/question/engine/tests/helpers.php
index 1e4ec1a38d129..407374e856245 100644
--- a/question/engine/tests/helpers.php
+++ b/question/engine/tests/helpers.php
@@ -611,8 +611,8 @@ public function assert_select_options($expectation, $html) {
      */
     public function assert_same_xml($expectedxml, $xml) {
         $this->assertEquals(
-            str_replace("\r\n", "\n", $expectedxml),
-            str_replace("\r\n", "\n", $xml)
+            phpunit_util::normalise_line_endings($expectedxml),
+            phpunit_util::normalise_line_endings($xml)
         );
     }
 }
diff --git a/question/format/xml/tests/qformat_xml_import_export_test.php b/question/format/xml/tests/qformat_xml_import_export_test.php
index 975770ff4e6cc..11ec1a6a52847 100644
--- a/question/format/xml/tests/qformat_xml_import_export_test.php
+++ b/question/format/xml/tests/qformat_xml_import_export_test.php
@@ -78,7 +78,7 @@ public function assert_same_xml($expectedxml, $xml) {
      */
     protected function normalise_xml($xml) {
         // Normalise line endings.
-        $xml = str_replace("\r\n", "\n", $xml);
+        $xml = phpunit_util::normalise_line_endings($xml);
         $xml = preg_replace("~\n$~", "", $xml); // Strip final newline in file.
 
         // Replace all numbers in question id comments with 0.
diff --git a/question/type/ordering/tests/questiontype_test.php b/question/type/ordering/tests/questiontype_test.php
index c82f9ee8066ef..00981c4fe4541 100644
--- a/question/type/ordering/tests/questiontype_test.php
+++ b/question/type/ordering/tests/questiontype_test.php
@@ -17,6 +17,7 @@
 namespace qtype_ordering;
 
 use core_question_generator;
+use phpunit_util;
 use qtype_ordering;
 use qtype_ordering_test_helper;
 use qtype_ordering_edit_form;
@@ -315,6 +316,9 @@ public function test_gift_export(): void {
 
         $expectedgift = file_get_contents(__DIR__ . '/fixtures/testexport.gift.txt');
 
-        $this->assertEquals($expectedgift, $gift);
+        $this->assertEquals(
+            phpunit_util::normalise_line_endings($expectedgift),
+            phpunit_util::normalise_line_endings($gift)
+        );
     }
 }

From dadfb6e90cf6f5e2d8bfede8ef174ed9502fa4ac Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Wed, 24 Apr 2024 12:00:54 +0200
Subject: [PATCH 32/75] MDL-81581 phpunit: Apply the new method to all
 remaining cases

After discussing it in the issue, we have agreed to apply
the new phpunit_util::normalise_line_endings() method to
all the remaining cases (within tests!) where the manual
replacement was being done. This commits achieves that.

Note that I've looked for both str_replace() and preg_replace()
cases, but only the former had cases worth converting. All the
later ones are different and cannot be replaced by the new
utility method.
---
 backup/util/xml/tests/writer_test.php         |  3 +-
 .../aiken/tests/qformat_aiken_export_test.php |  6 ++--
 .../format/gift/tests/giftformat_test.php     | 35 ++++++++++---------
 .../type/ordering/tests/questiontype_test.php |  2 +-
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/backup/util/xml/tests/writer_test.php b/backup/util/xml/tests/writer_test.php
index 2e5c4543551bf..109d26ba0058d 100644
--- a/backup/util/xml/tests/writer_test.php
+++ b/backup/util/xml/tests/writer_test.php
@@ -26,6 +26,7 @@
 namespace core_backup;
 
 use memory_xml_output;
+use phpunit_util;
 use xml_contenttransformer;
 use xml_output;
 use xml_writer;
@@ -314,7 +315,7 @@ function test_xml_writer_public_api() {
         $fcontents = file_get_contents($CFG->dirroot . '/backup/util/xml/tests/fixtures/test1.xml');
 
         // Normalise carriage return characters.
-        $fcontents = str_replace("\r\n", "\n", $fcontents);
+        $fcontents = phpunit_util::normalise_line_endings($fcontents);
         $this->assertEquals(trim($result), trim($fcontents));
     }
 }
diff --git a/question/format/aiken/tests/qformat_aiken_export_test.php b/question/format/aiken/tests/qformat_aiken_export_test.php
index ac0eb13d84139..4623e521106ec 100644
--- a/question/format/aiken/tests/qformat_aiken_export_test.php
+++ b/question/format/aiken/tests/qformat_aiken_export_test.php
@@ -44,8 +44,10 @@ class qformat_aiken_export_test extends advanced_testcase {
      * @param   string    $text The actual string.
      */
     public function assert_same_aiken($expectedtext, $text) {
-        $this->assertEquals(str_replace("\r\n", "\n", $expectedtext),
-                str_replace("\r\n", "\n", $text));
+        $this->assertEquals(
+            phpunit_util::normalise_line_endings($expectedtext),
+            phpunit_util::normalise_line_endings($text)
+        );
     }
 
     public function test_export_questions() {
diff --git a/question/format/gift/tests/giftformat_test.php b/question/format/gift/tests/giftformat_test.php
index ef0321b2ee7f9..1366e8cc07390 100644
--- a/question/format/gift/tests/giftformat_test.php
+++ b/question/format/gift/tests/giftformat_test.php
@@ -16,6 +16,7 @@
 
 namespace qformat_gift;
 
+use phpunit_util;
 use qformat_gift;
 use question_bank;
 use question_check_specified_fields_expectation;
@@ -37,15 +38,17 @@
  */
 class giftformat_test extends \question_testcase {
     public function assert_same_gift($expectedtext, $text) {
-        $this->assertEquals(str_replace("\r\n", "\n", $expectedtext),
-                str_replace("\r\n", "\n", $text));
+        $this->assertEquals(
+            phpunit_util::normalise_line_endings($expectedtext),
+            phpunit_util::normalise_line_endings($text)
+        );
     }
 
     public function test_import_essay() {
         $gift = '
 // essay
 ::Q8:: How are you? {}';
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -114,7 +117,7 @@ public function test_import_match() {
     =[markdown]A collection of web pages that anyone can add to or edit. -> Wiki
     = -> Chat
 }';
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -284,7 +287,7 @@ public function test_import_multichoice($numberingstyle) {
     ~red # [html]wrong, it's yellow
     ~[plain]blue # wrong, it's yellow
 }";
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -387,7 +390,7 @@ public function test_import_multichoice_multi() {
     ~%50%off-beige # right; good!
     ~%-100%[plain]blue # wrong
 }";
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -482,7 +485,7 @@ public function test_import_multichoice_multi_tricky() {
     ~%-50%red # wrong
     ~%-50%blue # wrong
 }";
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -694,7 +697,7 @@ public function test_import_numerical() {
         $gift = "
 // math range question
 ::Q5:: What is a number from 1 to 5? {#3:2~#Completely wrong}";
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -800,7 +803,7 @@ public function test_import_shortanswer() {
     =%50%Cat#What is it with Moodlers and cats?
     =%0%*#Completely wrong
 }";
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -856,7 +859,7 @@ public function test_import_shortanswer_with_general_feedback() {
     =%0%*#Completely wrong
     ####[html]Here is some general feedback!
 }";
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -1029,7 +1032,7 @@ public function test_import_truefalse() {
 // true/false
 ::Q1:: 42 is the Absolute Answer to everything.{
 FALSE#42 is the Ultimate Answer.#You gave the right answer.}";
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -1063,7 +1066,7 @@ public function test_import_truefalse() {
     public function test_import_truefalse_true_answer1() {
         $gift = "// name 0-11
 ::2-08 TSL::TSL is blablabla.{T}";
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -1097,7 +1100,7 @@ public function test_import_truefalse_true_answer1() {
     public function test_import_truefalse_true_answer2() {
         $gift = "// name 0-11
 ::2-08 TSL::TSL is blablabla.{TRUE}";
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -1219,7 +1222,7 @@ public function test_import_backslash() {
         $gift = '
 // essay
 ::double backslash:: A \\\\ B \\\\\\\\ C{}';
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -1257,7 +1260,7 @@ public function test_import_pre_content() {
     \}
 </pre>
 {}';
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
@@ -1296,7 +1299,7 @@ public function test_import_question_with_tags() {
 // This question is to test importing tags: [tag:tag] [tag:other-tag].
 // And an idnumber: [id:myid].
 ::Question name:: How are you? {}';
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
 
         $importer = new qformat_gift();
         $q = $importer->readquestion($lines);
diff --git a/question/type/ordering/tests/questiontype_test.php b/question/type/ordering/tests/questiontype_test.php
index 00981c4fe4541..5a390258ba412 100644
--- a/question/type/ordering/tests/questiontype_test.php
+++ b/question/type/ordering/tests/questiontype_test.php
@@ -293,7 +293,7 @@ public function test_gift_import(): void {
         // Import a question from GIFT.
         $gift = file_get_contents(__DIR__ . '/fixtures/testimport.gift.txt');
         $format = new qformat_gift();
-        $lines = preg_split('/[\\n\\r]/', str_replace("\r\n", "\n", $gift));
+        $lines = preg_split('/[\\n\\r]/', phpunit_util::normalise_line_endings($gift));
         $imported = $format->readquestion($lines);
 
         $this->assert(new question_check_specified_fields_expectation(self::expectedimport()), $imported);

From 88b4bc2bebf60be67e6ed9ad867fddcf5d69d748 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 25 Apr 2024 21:37:30 +0100
Subject: [PATCH 33/75] MDL-81697 qtype_ordering: correctly reference feedback
 file areas.

---
 question/type/ordering/question.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/question/type/ordering/question.php b/question/type/ordering/question.php
index 8ed6afee37c34..fce4b9b212538 100644
--- a/question/type/ordering/question.php
+++ b/question/type/ordering/question.php
@@ -385,7 +385,7 @@ public function check_file_access($qa, $options, $component, $filearea, $args, $
                 $answerid = reset($args); // Value of "itemid" is answer id.
                 return array_key_exists($answerid, $this->answers);
             }
-            if (in_array($filearea, $this->qtype->feedbackfields)) {
+            if (in_array($filearea, ['correctfeedback', 'partiallycorrectfeedback', 'incorrectfeedback'])) {
                 return $this->check_combined_feedback_file_access($qa, $options, $filearea, $args);
             }
             if ($filearea == 'hint') {

From f91dd598efed1b1ce00ed32d2416400cc768c298 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Fri, 26 Apr 2024 09:40:51 +0100
Subject: [PATCH 34/75] MDL-80597 mod_quiz: simplify filtering by tags Behat
 assertions.

The initial filtering for category was redundant, as it's applied
by default. While present it also caused reproducible failures on
CI due to timing issues when trying to apply multiple filters.
---
 mod/quiz/tests/behat/editing_add_random.feature | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mod/quiz/tests/behat/editing_add_random.feature b/mod/quiz/tests/behat/editing_add_random.feature
index 856db6e3c4c41..76232c4090b54 100644
--- a/mod/quiz/tests/behat/editing_add_random.feature
+++ b/mod/quiz/tests/behat/editing_add_random.feature
@@ -53,19 +53,20 @@ Feature: Adding random questions to a quiz based on category and tags
     Given I am on the "Quiz 1" "mod_quiz > Edit" page logged in as "teacher1"
     When I open the "last" add to quiz menu
     And I follow "a random question"
-    And I apply question bank filter "Category" with value "Questions Category 1"
     And I apply question bank filter "Tag" with value "foo"
-    And I click on "Apply filters" "button"
     And I wait until the page is ready
     And I should see "question 1 name"
-    And I should not see "question 3 name"
+    And I should see "\"listen\" & \"answer\""
     And I should not see "question 2 name"
+    And I should not see "question 3 name"
     And I should not see "question 4 name"
+    # Ensure tagged questions inside subcategories are also matched.
     And I set the field "Also show questions from subcategories" to "1"
     And I click on "Apply filters" "button"
     And I wait until the page is ready
     And I should see "question 1 name"
     And I should see "question 3 name"
+    And I should see "\"listen\" & \"answer\""
     And I should not see "question 2 name"
     And I should not see "question 4 name"
 

From 5f8b568cbc19a866c2212328230570ce160572fb Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Fri, 26 Apr 2024 15:08:33 +0100
Subject: [PATCH 35/75] MDL-79149 report_participation: more resilient activity
 access test.

Use the "Forum" module rather than the "Book" module, because the latter
emits two events when a student views it - if these two events happened
either side of a single second, then the report  would count two distinct
views (when it was trying to assert only one).
---
 .../tests/behat/filter_participation.feature  | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/report/participation/tests/behat/filter_participation.feature b/report/participation/tests/behat/filter_participation.feature
index 058ba0e3a3c00..c648a85978fb8 100644
--- a/report/participation/tests/behat/filter_participation.feature
+++ b/report/participation/tests/behat/filter_participation.feature
@@ -20,13 +20,9 @@ Feature: In a participation report, admin can filter student actions
       | student1 | C1 | student |
     And the following "activity" exists:
       | course      | C1             |
-      | activity    | book           |
-      | name        | Test book name |
-      | idnumber    | book1          |
-    And the following "mod_book > chapter" exists:
-      | book    | Test book name       |
-      | title   | Test chapter         |
-      | content | Test chapter content |
+      | activity    | forum           |
+      | name        | Test forum name |
+      | idnumber    | forum1          |
 
   @javascript
   Scenario: Filter participation report when standard log reader is enabled later
@@ -35,34 +31,39 @@ Feature: In a participation report, admin can filter student actions
     And I click on "Disable" "link" in the "Standard log" "table_row"
     And I log out
 
-    And I am on the "Test book name" "book activity" page logged in as student1
+    And I am on the "Test forum name" "forum activity" page logged in as student1
     And I log out
 
     And I log in as "admin"
     And I navigate to "Plugins > Logging > Manage log stores" in site administration
     And I click on "Enable" "link" in the "Standard log" "table_row"
 
-    And I am on the "Test book name" "book activity" page logged in as student1
+    And I am on the "Test forum name" "forum activity" page logged in as student1
 
     And I am on the "Course 1" course page logged in as admin
     When I navigate to "Reports" in current page administration
     And I click on "Course participation" "link"
-    And I set the field "instanceid" to "Test book name"
-    And I set the field "roleid" to "Student"
+    And I set the following fields to these values:
+      | Activity module | Test forum name |
+      | Show only       | Student         |
     And I press "Go"
-    Then I should see "Yes (1)"
+    Then the following should exist in the "reporttable" table:
+      | -1-       | All actions |
+      | Student 1 | Yes (1)     |
 
   @javascript
   Scenario: Filter participation report when only standard log reader is enabled by default
-    Given I am on the "Test book name" "book activity" page logged in as student1
-
-    And I am on the "Course 1" course page logged in as admin
+    Given I am on the "Test forum name" "forum activity" page logged in as student1
+    When I am on the "Course 1" course page logged in as admin
     And I navigate to "Reports" in current page administration
     And I click on "Course participation" "link"
-    And I set the field "instanceid" to "Test book name"
-    And I set the field "roleid" to "Student"
+    And I set the following fields to these values:
+      | Activity module | Test forum name |
+      | Show only       | Student         |
     And I press "Go"
-    Then I should see "Yes (1)"
+    Then the following should exist in the "reporttable" table:
+      | -1-       | All actions |
+      | Student 1 | Yes (1)     |
 
   @javascript
   Scenario Outline: Filter participation report by viewable roles
@@ -72,8 +73,8 @@ Feature: In a participation report, admin can filter student actions
     # Teacher role cannot see Manager by default.
     Then "Manager" "option" should not exist in the "Show only" "select"
     And I set the following fields to these values:
-      | Activity module | Test book name |
-      | Show only       | <role>         |
+      | Activity module | Test forum name |
+      | Show only       | <role>          |
     And I press "Go"
     And I should see "<uservisible>" in the "reporttable" "table"
     And I should not see "<usernonvisible>" in the "reporttable" "table"

From 5ced156252d5341efd6738c1dfaf5307f94f499c Mon Sep 17 00:00:00 2001
From: Anupama Sarjoshi <anupama.sarjoshi@open.ac.uk>
Date: Wed, 24 Apr 2024 17:05:47 +0100
Subject: [PATCH 36/75] MDL-81380 qbank_columnsortorder: Add upgrade.php

Before Moodle 4.3, config_plugins settings for qbank_columnsortorder
(disabledcol, enabledcol) had a value like
qbank_statistics\columns\facility_index,
qbank_statistics\columns\discriminative_efficiency, ...
In Moodle 4.3, the values are stored as
qbank_statistics\columns\facility_index-facility_index.
So updating the old values to match the new format.
---
 question/bank/columnsortorder/db/upgrade.php | 74 ++++++++++++++++++++
 question/bank/columnsortorder/version.php    |  2 +-
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 question/bank/columnsortorder/db/upgrade.php

diff --git a/question/bank/columnsortorder/db/upgrade.php b/question/bank/columnsortorder/db/upgrade.php
new file mode 100644
index 0000000000000..e149e542fc3c9
--- /dev/null
+++ b/question/bank/columnsortorder/db/upgrade.php
@@ -0,0 +1,74 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Custom sort order upgrade script.
+ *
+ * @package   qbank_columnsortorder
+ * @copyright 2024 The Open University
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+use core_question\local\bank\column_base;
+
+/**
+ * Upgrade the plugin.
+ *
+ * @param int $oldversion the version of this plugin we are upgrading from.
+ * @return bool success/failure.
+ */
+function xmldb_qbank_columnsortorder_upgrade($oldversion) {
+    global $DB;
+
+    if ($oldversion < 2024042201) {
+        // Before Moodle 4.3, config_plugins settings for qbank_columnsortorder (disabledcol, enabledcol) had a value like
+        // qbank_statistics\columns\facility_index,qbank_statistics\columns\discriminative_efficiency, ...
+        // In Moodle 4.3, the values are stored as qbank_statistics\columns\discriminative_efficiency-discriminative_efficiency.
+        // So updating the old values to match the new format.
+        // Update the columns records for qbank_columnsortorder plugin.
+        $pluginconfigs = $DB->get_records('config_plugins', ['plugin' => 'qbank_columnsortorder'], 'name, value');
+
+        foreach ($pluginconfigs as $config) {
+            if ($config->name == 'version') {
+                continue;
+            }
+            $fields = explode(',', $config->value);
+            $updatedcols = [];
+            foreach ($fields as $columnclass) {
+                // Columns config that are already in the correct format, could be ignored.
+                if (str_contains($columnclass, column_base::ID_SEPARATOR)) {
+                    continue;
+                }
+
+                $classbits = explode('\\', $columnclass);
+                $columnname = end($classbits);
+
+                // The custom fields are to be in the format e.g., qbank_customfields\custom_field_column-test.
+                if (str_contains($columnclass, 'custom_field_column')) {
+                    array_pop($classbits);
+                }
+
+                $updatedcols[] = implode('\\', $classbits) . column_base::ID_SEPARATOR . $columnname;
+            }
+            $updatedconfig = implode(',', $updatedcols);
+            set_config($config->name, $updatedconfig, 'qbank_columnsortorder');
+        }
+        // Custom sort order savepoint reached.
+        upgrade_plugin_savepoint(true, 2024042201, 'qbank', 'qbank_columnsortorder');
+    }
+
+    return true;
+}
diff --git a/question/bank/columnsortorder/version.php b/question/bank/columnsortorder/version.php
index 75f003f6477c6..3a8eea4f4e37f 100644
--- a/question/bank/columnsortorder/version.php
+++ b/question/bank/columnsortorder/version.php
@@ -26,6 +26,6 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'qbank_columnsortorder';
-$plugin->version   = 2024042200;
+$plugin->version   = 2024042201;
 $plugin->requires  = 2024041600;
 $plugin->maturity  = MATURITY_STABLE;

From 74a6ed82b31d340b62e6bd255f21e8946ffe6db6 Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Fri, 5 Apr 2024 10:37:59 +1100
Subject: [PATCH 37/75] MDL-80849 communication_matrix: Prevent numeric
 usernames

---
 .../provider/matrix/classes/matrix_user_manager.php   | 11 +++++++++++
 .../matrix/tests/matrix_user_manager_test.php         |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/communication/provider/matrix/classes/matrix_user_manager.php b/communication/provider/matrix/classes/matrix_user_manager.php
index 38323c70f0a07..2dd4041f8b0c6 100644
--- a/communication/provider/matrix/classes/matrix_user_manager.php
+++ b/communication/provider/matrix/classes/matrix_user_manager.php
@@ -24,6 +24,12 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class matrix_user_manager {
+
+    /**
+     * Prefix for Matrix usernames when they are detected as numeric.
+     */
+    const MATRIX_USER_PREFIX = 'user';
+
     /**
      * Gets matrix user id from moodle.
      *
@@ -56,6 +62,11 @@ public static function get_formatted_matrix_userid(
         $username = preg_replace('/[@#$%^&*()+{}|<>?!,]/i', '.', $username);
         $username = ltrim(rtrim($username, '.'), '.');
 
+        // Matrix/Synapse servers will not allow numeric usernames.
+        if (is_numeric($username)) {
+            $username = self::MATRIX_USER_PREFIX . $username;
+        }
+
         $homeserver = self::get_formatted_matrix_home_server();
 
         return "@{$username}:{$homeserver}";
diff --git a/communication/provider/matrix/tests/matrix_user_manager_test.php b/communication/provider/matrix/tests/matrix_user_manager_test.php
index 00877c4b9badb..559e435e4174b 100644
--- a/communication/provider/matrix/tests/matrix_user_manager_test.php
+++ b/communication/provider/matrix/tests/matrix_user_manager_test.php
@@ -126,6 +126,11 @@ public static function get_formatted_matrix_userid_provider(): array {
                 'colin.creavey',
                 '@colin.creavey:matrix.example.org',
             ],
+            'numeric username' => [
+                'https://matrix.example.org',
+                '123456',
+                '@' . matrix_user_manager::MATRIX_USER_PREFIX . '123456:matrix.example.org',
+            ],
         ];
     }
 

From 641937a47ec5a8cb3efbed3cca17b25f9eb59da6 Mon Sep 17 00:00:00 2001
From: Ilya Tregubov <ilya.a.tregubov@gmail.com>
Date: Mon, 29 Apr 2024 10:46:14 +0800
Subject: [PATCH 38/75] MDL-81380 qbank_columnsortorder: Add type and return
 value hint

---
 question/bank/columnsortorder/db/upgrade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/question/bank/columnsortorder/db/upgrade.php b/question/bank/columnsortorder/db/upgrade.php
index e149e542fc3c9..cd455a053a330 100644
--- a/question/bank/columnsortorder/db/upgrade.php
+++ b/question/bank/columnsortorder/db/upgrade.php
@@ -30,7 +30,7 @@
  * @param int $oldversion the version of this plugin we are upgrading from.
  * @return bool success/failure.
  */
-function xmldb_qbank_columnsortorder_upgrade($oldversion) {
+function xmldb_qbank_columnsortorder_upgrade(int $oldversion): bool {
     global $DB;
 
     if ($oldversion < 2024042201) {

From 6ca8fde7f578454103614dd8120101bf437abd9c Mon Sep 17 00:00:00 2001
From: Mihail Geshoski <mihail@moodle.com>
Date: Mon, 29 Apr 2024 11:41:22 +0800
Subject: [PATCH 39/75] MDL-48940 core: Final deprecation of
 search_generate_text_SQL()

---
 lib/deprecatedlib.php |  8 ++++++++
 lib/searchlib.php     | 17 -----------------
 lib/upgrade.txt       |  4 ++++
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 409a16a418780..5d29835affa3e 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -3216,3 +3216,11 @@ function question_add_context_in_key() {
 function question_fix_top_names() {
     throw new coding_exception(__FUNCTION__ . '() has been removed.');
 }
+
+/**
+ * @deprecated since Moodle 2.9
+ */
+#[\core\attribute\deprecated('search_generate_SQL', since: '2.9', mdl: 'MDL-48939', final: true)]
+function search_generate_text_SQL() {
+    \core\deprecation::emit_deprecation_if_present(__FUNCTION__);
+}
diff --git a/lib/searchlib.php b/lib/searchlib.php
index c158c78ecf537..c2caf7ae79fa6 100644
--- a/lib/searchlib.php
+++ b/lib/searchlib.php
@@ -381,23 +381,6 @@ function plainstring($content){
     }
 }
 
-/**
- * Primitive function to generate a SQL string from a parse tree
- * using TEXT indexes. If searches aren't suitable to use TEXT
- * this function calls the default search_generate_SQL() one.
- *
- * @deprecated since Moodle 2.9 MDL-48939
- * @todo MDL-48940 This will be deleted in Moodle 3.2
- * @see search_generate_SQL()
- */
-function search_generate_text_SQL($parsetree, $datafield, $metafield, $mainidfield, $useridfield,
-                             $userfirstnamefield, $userlastnamefield, $timefield, $instancefield) {
-    debugging('search_generate_text_SQL() is deprecated, please use search_generate_SQL() instead.', DEBUG_DEVELOPER);
-
-    return search_generate_SQL($parsetree, $datafield, $metafield, $mainidfield, $useridfield,
-                               $userfirstnamefield, $userlastnamefield, $timefield, $instancefield);
-}
-
 /**
  * Primitive function to generate a SQL string from a parse tree.
  * Parameters:
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 49ec5e12f8e23..7be6031780aff 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -1,6 +1,10 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
+=== 4.5 ===
+
+* The previously deprecated function `search_generate_text_SQL` has been removed and can no longer be used.
+
 === 4.4 ===
 
 * New modinfo methods related to delegated sections (sections controlled by a component):

From 7721ddb679096ee6076a77629a92329569787721 Mon Sep 17 00:00:00 2001
From: Ilya Tregubov <ilya.a.tregubov@gmail.com>
Date: Fri, 26 Apr 2024 10:54:05 +0800
Subject: [PATCH 40/75] MDL-78889 gradereport_user: Fix pass/fail icon for
 totals

When the category has a 'grade to pass' set, the pass/fail icon
was displayed even when the category total grade values was hidden.
---
 grade/report/user/classes/report/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grade/report/user/classes/report/user.php b/grade/report/user/classes/report/user.php
index 8ed200e854b78..c9cfc11682fad 100644
--- a/grade/report/user/classes/report/user.php
+++ b/grade/report/user/classes/report/user.php
@@ -713,7 +713,7 @@ private function fill_table_recursive(array &$element) {
                         $gradestatusclass = '';
                         $gradepassicon = '';
                         $ispassinggrade = $gradegrade->is_passed($gradegrade->grade_item);
-                        if (!is_null($ispassinggrade)) {
+                        if (!is_null($gradeval) && !is_null($ispassinggrade)) {
                             $gradestatusclass = $ispassinggrade ? 'gradepass' : 'gradefail';
                             if ($ispassinggrade) {
                                 $gradepassicon = $OUTPUT->pix_icon(

From 9c601e5f0b64b63ee5c23031b0f0b76bc6d2f101 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 22 Apr 2024 08:30:06 +0100
Subject: [PATCH 41/75] MDL-81621 mod_bigbluebuttonbn: remove reflection
 setAccessible call.

See 361dfe8145 for context.
---
 .../tests/task/base_send_notification_test.php                | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mod/bigbluebuttonbn/tests/task/base_send_notification_test.php b/mod/bigbluebuttonbn/tests/task/base_send_notification_test.php
index 5ef3850081a34..c21082a383556 100644
--- a/mod/bigbluebuttonbn/tests/task/base_send_notification_test.php
+++ b/mod/bigbluebuttonbn/tests/task/base_send_notification_test.php
@@ -53,9 +53,7 @@ private function get_mock(): base_send_notification {
      */
     private function get_instance_reflection(): \ReflectionMethod {
         $rc = new \ReflectionClass(base_send_notification::class);
-        $rcm = $rc->getMethod('get_instance');
-        $rcm->setAccessible(true);
-        return $rcm;
+        return $rc->getMethod('get_instance');
     }
 
     /**

From 1435a5fab6c1ffcdf9654a5af4ed60c89d31ea6f Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Wed, 24 Apr 2024 19:23:52 +0100
Subject: [PATCH 42/75] MDL-81656 h5p: correct content editing URL parameter
 handling.

---
 h5p/classes/player.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/h5p/classes/player.php b/h5p/classes/player.php
index a2f8564cea3f2..c1af5db6e5795 100644
--- a/h5p/classes/player.php
+++ b/h5p/classes/player.php
@@ -154,7 +154,7 @@ public function __construct(string $url, \stdClass $config, bool $preventredirec
      * Get the encoded URL for embeding this H5P content.
      *
      * @param string $url Local URL of the H5P file to display.
-     * @param stdClass $config Configuration for H5P buttons.
+     * @param \stdClass $config Configuration for H5P buttons.
      * @param bool $preventredirect Set to true in scripts that can not redirect (CLI, RSS feeds, etc.), throws exceptions
      * @param string $component optional moodle component to sent xAPI tracking
      * @param bool $displayedit Whether the edit button should be displayed below the H5P content.
@@ -163,7 +163,8 @@ public function __construct(string $url, \stdClass $config, bool $preventredirec
      * @return string The embedable code to display a H5P file.
      */
     public static function display(
-        string $url, \stdClass $config,
+        string $url,
+        \stdClass $config,
         bool $preventredirect = true,
         string $component = '',
         bool $displayedit = false,
@@ -193,7 +194,7 @@ public static function display(
             if ($originalfile) {
                 // Check if the user can edit this content.
                 if (api::can_edit_content($originalfile)) {
-                    $template->editurl = $CFG->wwwroot . '/h5p/edit.php?url=' . $url;
+                    $template->editurl = (new \moodle_url('/h5p/edit.php', ['url' => $url]))->out(false);
                 }
             }
         }

From e05879814f133e82725e31592737f92b4811c705 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 29 Apr 2024 09:38:21 +0100
Subject: [PATCH 43/75] MDL-81707 availability_grade: fix alignment of
 condition checkboxes.

---
 .../moodle-availability_grade-form-debug.js              | 4 ++--
 .../moodle-availability_grade-form-min.js                | 2 +-
 .../moodle-availability_grade-form.js                    | 4 ++--
 availability/condition/grade/yui/src/form/js/form.js     | 4 ++--
 theme/boost/scss/moodle/forms.scss                       | 9 ---------
 theme/boost/style/moodle.css                             | 7 -------
 theme/classic/style/moodle.css                           | 7 -------
 7 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form-debug.js b/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form-debug.js
index 518e96f30e738..b09f35eae8fec 100644
--- a/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form-debug.js
+++ b/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form-debug.js
@@ -46,13 +46,13 @@ M.availability_grade.form.getNode = function(json) {
         html += '<option value="' + grade.id + '">' + grade.name + '</option>';
     }
     html += '</select></span></label> <br><span class="availability-group mb-3">' +
-            '<label><input type="checkbox" class="form-check-input mx-1" name="min"/>' +
+            '<label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="min"/>' +
             M.util.get_string('option_min', 'availability_grade') +
             '</label> <label><span class="accesshide">' + M.util.get_string('label_min', 'availability_grade') +
             '</span><input type="text" class="form-control mx-1" name="minval" title="' +
             M.util.get_string('label_min', 'availability_grade') + '"/></label>%</span><br>' +
             '<span class="availability-group mb-3">' +
-            '<label><input type="checkbox" class="form-check-input mx-1" name="max"/>' +
+            '<label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="max"/>' +
             M.util.get_string('option_max', 'availability_grade') +
             '</label> <label><span class="accesshide">' + M.util.get_string('label_max', 'availability_grade') +
             '</span><input type="text" class="form-control mx-1" name="maxval" title="' +
diff --git a/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form-min.js b/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form-min.js
index 6253c99a67616..5a62fbbc389a0 100644
--- a/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form-min.js
+++ b/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form-min.js
@@ -1 +1 @@
-YUI.add("moodle-availability_grade-form",function(r,a){M.availability_grade=M.availability_grade||{},M.availability_grade.form=r.Object(M.core_availability.plugin),M.availability_grade.form.grades=null,M.availability_grade.form.initInner=function(a){this.grades=a,this.nodesSoFar=0},M.availability_grade.form.getNode=function(a){var e,i,l,t,n;for(this.nodesSoFar++,e='<label class="mb-3"><span class="pr-3">'+M.util.get_string("title","availability_grade")+'</span> <span class="availability-group"><select name="id" class="custom-select"><option value="0">'+M.util.get_string("choosedots","moodle")+"</option>",i=0;i<this.grades.length;i++)e+='<option value="'+(l=this.grades[i]).id+'">'+l.name+"</option>";return e+='</select></span></label> <br><span class="availability-group mb-3"><label><input type="checkbox" class="form-check-input mx-1" name="min"/>'+M.util.get_string("option_min","availability_grade")+'</label> <label><span class="accesshide">'+M.util.get_string("label_min","availability_grade")+'</span><input type="text" class="form-control mx-1" name="minval" title="'+M.util.get_string("label_min","availability_grade")+'"/></label>%</span><br><span class="availability-group mb-3"><label><input type="checkbox" class="form-check-input mx-1" name="max"/>'+M.util.get_string("option_max","availability_grade")+'</label> <label><span class="accesshide">'+M.util.get_string("label_max","availability_grade")+'</span><input type="text" class="form-control mx-1" name="maxval" title="'+M.util.get_string("label_max","availability_grade")+'"/></label>%</span>',t=r.Node.create('<div class="d-inline-block d-flex flex-wrap align-items-center">'+e+"</div>"),a.id!==undefined&&t.one("select[name=id] > option[value="+a.id+"]")&&t.one("select[name=id]").set("value",""+a.id),a.min!==undefined&&(t.one("input[name=min]").set("checked",!0),t.one("input[name=minval]").set("value",a.min)),a.max!==undefined&&(t.one("input[name=max]").set("checked",!0),t.one("input[name=maxval]").set("value",a.max)),n=function(a,e){var i=a.ancestor("label").next("label").one("input"),a=a.get("checked");return i.set("disabled",!a),e&&a&&i.focus(),a},t.all("input[type=checkbox]").each(n),M.availability_grade.form.addedEvents||(M.availability_grade.form.addedEvents=!0,(a=r.one(".availability-field")).delegate("change",function(){M.core_availability.form.update()},".availability_grade select[name=id]"),a.delegate("click",function(){n(this,!0),M.core_availability.form.update()},".availability_grade input[type=checkbox]"),a.delegate("valuechange",function(){M.core_availability.form.update()},".availability_grade input[type=text]")),t},M.availability_grade.form.fillValue=function(a,e){a.id=parseInt(e.one("select[name=id]").get("value"),10),e.one("input[name=min]").get("checked")&&(a.min=this.getValue("minval",e)),e.one("input[name=max]").get("checked")&&(a.max=this.getValue("maxval",e))},M.availability_grade.form.getValue=function(a,e){a=e.one("input[name="+a+"]").get("value");return!/^[0-9]+([.,][0-9]+)?$/.test(a)||(e=parseFloat(a.replace(",",".")))<0||100<e?a:e},M.availability_grade.form.fillErrors=function(a,e){var i={};this.fillValue(i,e),0===i.id&&a.push("availability_grade:error_selectgradeid"),i.min!==undefined&&"string"==typeof i.min||i.max!==undefined&&"string"==typeof i.max?a.push("availability_grade:error_invalidnumber"):i.min!==undefined&&i.max!==undefined&&i.max<=i.min&&a.push("availability_grade:error_backwardrange")}},"@VERSION@",{requires:["base","node","event","moodle-core_availability-form"]});
\ No newline at end of file
+YUI.add("moodle-availability_grade-form",function(r,a){M.availability_grade=M.availability_grade||{},M.availability_grade.form=r.Object(M.core_availability.plugin),M.availability_grade.form.grades=null,M.availability_grade.form.initInner=function(a){this.grades=a,this.nodesSoFar=0},M.availability_grade.form.getNode=function(a){var e,i,l,t,n;for(this.nodesSoFar++,e='<label class="mb-3"><span class="pr-3">'+M.util.get_string("title","availability_grade")+'</span> <span class="availability-group"><select name="id" class="custom-select"><option value="0">'+M.util.get_string("choosedots","moodle")+"</option>",i=0;i<this.grades.length;i++)e+='<option value="'+(l=this.grades[i]).id+'">'+l.name+"</option>";return e+='</select></span></label> <br><span class="availability-group mb-3"><label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="min"/>'+M.util.get_string("option_min","availability_grade")+'</label> <label><span class="accesshide">'+M.util.get_string("label_min","availability_grade")+'</span><input type="text" class="form-control mx-1" name="minval" title="'+M.util.get_string("label_min","availability_grade")+'"/></label>%</span><br><span class="availability-group mb-3"><label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="max"/>'+M.util.get_string("option_max","availability_grade")+'</label> <label><span class="accesshide">'+M.util.get_string("label_max","availability_grade")+'</span><input type="text" class="form-control mx-1" name="maxval" title="'+M.util.get_string("label_max","availability_grade")+'"/></label>%</span>',t=r.Node.create('<div class="d-inline-block d-flex flex-wrap align-items-center">'+e+"</div>"),a.id!==undefined&&t.one("select[name=id] > option[value="+a.id+"]")&&t.one("select[name=id]").set("value",""+a.id),a.min!==undefined&&(t.one("input[name=min]").set("checked",!0),t.one("input[name=minval]").set("value",a.min)),a.max!==undefined&&(t.one("input[name=max]").set("checked",!0),t.one("input[name=maxval]").set("value",a.max)),n=function(a,e){var i=a.ancestor("label").next("label").one("input"),a=a.get("checked");return i.set("disabled",!a),e&&a&&i.focus(),a},t.all("input[type=checkbox]").each(n),M.availability_grade.form.addedEvents||(M.availability_grade.form.addedEvents=!0,(a=r.one(".availability-field")).delegate("change",function(){M.core_availability.form.update()},".availability_grade select[name=id]"),a.delegate("click",function(){n(this,!0),M.core_availability.form.update()},".availability_grade input[type=checkbox]"),a.delegate("valuechange",function(){M.core_availability.form.update()},".availability_grade input[type=text]")),t},M.availability_grade.form.fillValue=function(a,e){a.id=parseInt(e.one("select[name=id]").get("value"),10),e.one("input[name=min]").get("checked")&&(a.min=this.getValue("minval",e)),e.one("input[name=max]").get("checked")&&(a.max=this.getValue("maxval",e))},M.availability_grade.form.getValue=function(a,e){a=e.one("input[name="+a+"]").get("value");return!/^[0-9]+([.,][0-9]+)?$/.test(a)||(e=parseFloat(a.replace(",",".")))<0||100<e?a:e},M.availability_grade.form.fillErrors=function(a,e){var i={};this.fillValue(i,e),0===i.id&&a.push("availability_grade:error_selectgradeid"),i.min!==undefined&&"string"==typeof i.min||i.max!==undefined&&"string"==typeof i.max?a.push("availability_grade:error_invalidnumber"):i.min!==undefined&&i.max!==undefined&&i.max<=i.min&&a.push("availability_grade:error_backwardrange")}},"@VERSION@",{requires:["base","node","event","moodle-core_availability-form"]});
\ No newline at end of file
diff --git a/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form.js b/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form.js
index 518e96f30e738..b09f35eae8fec 100644
--- a/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form.js
+++ b/availability/condition/grade/yui/build/moodle-availability_grade-form/moodle-availability_grade-form.js
@@ -46,13 +46,13 @@ M.availability_grade.form.getNode = function(json) {
         html += '<option value="' + grade.id + '">' + grade.name + '</option>';
     }
     html += '</select></span></label> <br><span class="availability-group mb-3">' +
-            '<label><input type="checkbox" class="form-check-input mx-1" name="min"/>' +
+            '<label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="min"/>' +
             M.util.get_string('option_min', 'availability_grade') +
             '</label> <label><span class="accesshide">' + M.util.get_string('label_min', 'availability_grade') +
             '</span><input type="text" class="form-control mx-1" name="minval" title="' +
             M.util.get_string('label_min', 'availability_grade') + '"/></label>%</span><br>' +
             '<span class="availability-group mb-3">' +
-            '<label><input type="checkbox" class="form-check-input mx-1" name="max"/>' +
+            '<label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="max"/>' +
             M.util.get_string('option_max', 'availability_grade') +
             '</label> <label><span class="accesshide">' + M.util.get_string('label_max', 'availability_grade') +
             '</span><input type="text" class="form-control mx-1" name="maxval" title="' +
diff --git a/availability/condition/grade/yui/src/form/js/form.js b/availability/condition/grade/yui/src/form/js/form.js
index b12aa47dc6d98..08c2dcd4d2105 100644
--- a/availability/condition/grade/yui/src/form/js/form.js
+++ b/availability/condition/grade/yui/src/form/js/form.js
@@ -44,13 +44,13 @@ M.availability_grade.form.getNode = function(json) {
         html += '<option value="' + grade.id + '">' + grade.name + '</option>';
     }
     html += '</select></span></label> <br><span class="availability-group mb-3">' +
-            '<label><input type="checkbox" class="form-check-input mx-1" name="min"/>' +
+            '<label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="min"/>' +
             M.util.get_string('option_min', 'availability_grade') +
             '</label> <label><span class="accesshide">' + M.util.get_string('label_min', 'availability_grade') +
             '</span><input type="text" class="form-control mx-1" name="minval" title="' +
             M.util.get_string('label_min', 'availability_grade') + '"/></label>%</span><br>' +
             '<span class="availability-group mb-3">' +
-            '<label><input type="checkbox" class="form-check-input mx-1" name="max"/>' +
+            '<label><input type="checkbox" class="form-check-input position-static mt-0 mx-1" name="max"/>' +
             M.util.get_string('option_max', 'availability_grade') +
             '</label> <label><span class="accesshide">' + M.util.get_string('label_max', 'availability_grade') +
             '</span><input type="text" class="form-control mx-1" name="maxval" title="' +
diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss
index 86e06174d8a58..5e2d63e99f162 100644
--- a/theme/boost/scss/moodle/forms.scss
+++ b/theme/boost/scss/moodle/forms.scss
@@ -209,15 +209,6 @@ div#dateselector-calendar-panel {
     display: none;
 }
 
-.availability-field {
-    label {
-        display: inline-flex;
-    }
-    .availability-group label {
-        vertical-align: top;
-    }
-}
-
 .availability-eye {
     clear: left;
     float: left;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index efa84f2582eb2..34ad7f3f85031 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -33113,13 +33113,6 @@ div#dateselector-calendar-panel {
   display: none;
 }
 
-.availability-field label {
-  display: inline-flex;
-}
-.availability-field .availability-group label {
-  vertical-align: top;
-}
-
 .availability-eye {
   clear: left;
   float: left;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 84231bbec3110..ed3d481af7d16 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -33113,13 +33113,6 @@ div#dateselector-calendar-panel {
   display: none;
 }
 
-.availability-field label {
-  display: inline-flex;
-}
-.availability-field .availability-group label {
-  vertical-align: top;
-}
-
 .availability-eye {
   clear: left;
   float: left;

From e95cf005232fcdde05dde9420cf765125b75f88e Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Fri, 22 Mar 2024 20:55:46 +0000
Subject: [PATCH 44/75] MDL-81399 reportbuilder: add language/timezone
 reporting for users.

---
 reportbuilder/classes/local/entities/user.php | 21 +++++++++++++
 .../reportbuilder/datasource/users_test.php   | 30 +++++++++++++++++--
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/reportbuilder/classes/local/entities/user.php b/reportbuilder/classes/local/entities/user.php
index 3dfa5fca68399..4e1c112992e17 100644
--- a/reportbuilder/classes/local/entities/user.php
+++ b/reportbuilder/classes/local/entities/user.php
@@ -23,6 +23,7 @@
 use context_user;
 use core\context;
 use core_component;
+use core_date;
 use html_writer;
 use lang_string;
 use moodle_url;
@@ -429,6 +430,8 @@ protected function get_user_fields(): array {
             'email' => new lang_string('email'),
             'city' => new lang_string('city'),
             'country' => new lang_string('country'),
+            'lang' => new lang_string('language'),
+            'timezone' => new lang_string('timezone'),
             'theme' => new lang_string('theme'),
             'description' => new lang_string('description'),
             'firstnamephonetic' => new lang_string('firstnamephonetic'),
@@ -596,6 +599,24 @@ public static function get_options_for_country(): array {
         return get_string_manager()->get_list_of_countries();
     }
 
+    /**
+     * List of options for the field lang.
+     *
+     * @return string[]
+     */
+    public static function get_options_for_lang(): array {
+        return get_string_manager()->get_list_of_translations();
+    }
+
+    /**
+     * List of options for the field timezone.
+     *
+     * @return string[]
+     */
+    public static function get_options_for_timezone(): array {
+        return core_date::get_list_of_timezones(null, true);
+    }
+
     /**
      * List of options for the field theme.
      *
diff --git a/user/tests/reportbuilder/datasource/users_test.php b/user/tests/reportbuilder/datasource/users_test.php
index 29e6d45a37442..46bcb06f9e80a 100644
--- a/user/tests/reportbuilder/datasource/users_test.php
+++ b/user/tests/reportbuilder/datasource/users_test.php
@@ -40,7 +40,7 @@
  * @copyright   2022 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class users_test extends core_reportbuilder_testcase {
+final class users_test extends core_reportbuilder_testcase {
 
     /**
      * Test default datasource
@@ -77,6 +77,8 @@ public function test_datasource_non_default_columns(): void {
             'idnumber' => 'U0001',
             'city' => 'London',
             'country' => 'GB',
+            'lang' => 'en',
+            'timezone' => 'Europe/London',
             'theme' => 'boost',
             'interests' => ['Horses'],
         ]);
@@ -98,6 +100,8 @@ public function test_datasource_non_default_columns(): void {
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:lastname']);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:city']);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:country']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:lang']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:timezone']);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:description']);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:firstnamephonetic']);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:lastnamephonetic']);
@@ -155,6 +159,8 @@ public function test_datasource_non_default_columns(): void {
             $lastname,
             $city,
             $country,
+            $lang,
+            $timezone,
             $description,
             $firstnamephonetic,
             $lastnamephonetic,
@@ -187,6 +193,8 @@ public function test_datasource_non_default_columns(): void {
         $this->assertEquals($user->lastname, $lastname);
         $this->assertEquals($user->city, $city);
         $this->assertEquals('United Kingdom', $country);
+        $this->assertEquals('English ‎(en)‎', $lang);
+        $this->assertEquals('Europe/London', $timezone);
         $this->assertEquals($user->description, $description);
         $this->assertEquals($user->firstnamephonetic, $firstnamephonetic);
         $this->assertEquals($user->lastnamephonetic, $lastnamephonetic);
@@ -216,7 +224,7 @@ public function test_datasource_non_default_columns(): void {
      *
      * @return array[]
      */
-    public function datasource_filters_provider(): array {
+    public static function datasource_filters_provider(): array {
         return [
             // User.
             'Filter user' => ['user:userselect', [
@@ -327,6 +335,22 @@ public function datasource_filters_provider(): array {
                 'user:country_operator' => select::EQUAL_TO,
                 'user:country_value' => 'AU',
             ], false],
+            'Filter lang' => ['user:lang', [
+                'user:lang_operator' => select::EQUAL_TO,
+                'user:lang_value' => 'en',
+            ], true],
+            'Filter lang (no match)' => ['user:lang', [
+                'user:lang_operator' => select::EQUAL_TO,
+                'user:lang_value' => 'de',
+            ], false],
+            'Filter timezone' => ['user:timezone', [
+                'user:timezone_operator' => select::EQUAL_TO,
+                'user:timezone_value' => 'Europe/Barcelona',
+            ], true],
+            'Filter timezone (no match)' => ['user:timezone', [
+                'user:timezone_operator' => select::EQUAL_TO,
+                'user:timezone_value' => 'Australia/Perth',
+            ], false],
             'Filter theme' => ['user:theme', [
                 'user:theme_operator' => select::EQUAL_TO,
                 'user:theme_value' => 'boost',
@@ -487,6 +511,8 @@ public function test_datasource_filters(string $filtername, array $filtervalues,
             'address' => 'Big Farm',
             'city' => 'Barcelona',
             'country' => 'ES',
+            'lang' => 'en',
+            'timezone' => 'Europe/Barcelona',
             'theme' => 'boost',
             'description' => 'Hello there',
             'moodlenetprofile' => '@zoe1@example.com',

From c60d03a7b625ee63a019deec499ff062f75230b6 Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Mon, 29 Apr 2024 12:09:17 +0200
Subject: [PATCH 45/75] MDL-81717 h5p: Improve robustness content type fetching

Strengthen code to ensure retrieval of all content types, despite
failures.
---
 h5p/classes/core.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/h5p/classes/core.php b/h5p/classes/core.php
index 8c6935dd59863..6bedab9b7e2ca 100644
--- a/h5p/classes/core.php
+++ b/h5p/classes/core.php
@@ -273,8 +273,16 @@ public function fetch_content_type(array $library): ?int {
 
         $librarykey = static::libraryToString($library);
 
+        if (is_null($factory->get_storage()->h5pC->librariesJsonData)) {
+            // There was an error fetching the content type.
+            debugging('Error fetching content type: ' . $librarykey);
+            return null;
+        }
+
         $libraryjson = $factory->get_storage()->h5pC->librariesJsonData[$librarykey];
-        if (!array_key_exists('libraryId', $libraryjson)) {
+        if (is_null($libraryjson) || !array_key_exists('libraryId', $libraryjson)) {
+            // There was an error fetching the content type.
+            debugging('Error fetching content type: ' . $librarykey);
             return null;
         }
 

From 0a9715a88aed2876886376f7c51207ab57119fd5 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 4 Apr 2024 17:29:54 +0100
Subject: [PATCH 46/75] MDL-81330 reportbuilder: add cohort data to
 participants report source.

This is consistent with data added to similar sources that include user
attainment data, in this case users' course completion.
---
 .../reportbuilder/datasource/participants.php | 31 ++++++++++-
 .../datasource/participants_test.php          | 41 +++++++++++---
 reportbuilder/classes/datasource.php          | 10 +++-
 reportbuilder/tests/datasource_test.php       | 55 ++++++++++++++++++-
 reportbuilder/upgrade.txt                     |  4 ++
 5 files changed, 130 insertions(+), 11 deletions(-)

diff --git a/course/classes/reportbuilder/datasource/participants.php b/course/classes/reportbuilder/datasource/participants.php
index 558a539a3d0f0..a4b98368d4034 100644
--- a/course/classes/reportbuilder/datasource/participants.php
+++ b/course/classes/reportbuilder/datasource/participants.php
@@ -18,6 +18,7 @@
 
 namespace core_course\reportbuilder\datasource;
 
+use core_cohort\reportbuilder\local\entities\cohort;
 use core_course\reportbuilder\local\entities\course_category;
 use core_course\reportbuilder\local\entities\access;
 use core_course\reportbuilder\local\entities\completion;
@@ -113,6 +114,18 @@ protected function initialise(): void {
                        ON {$groups}.courseid = {$course}.id AND {$groups}.userid = {$user}.id")
         );
 
+        // Join cohort entity.
+        $cohortentity = new cohort();
+        $cohortalias = $cohortentity->get_table_alias('cohort');
+        $cohortmemberalias = database::generate_alias();
+        $this->add_entity($cohortentity
+            ->add_joins($userentity->get_joins())
+            ->add_joins([
+                "LEFT JOIN {cohort_members} {$cohortmemberalias} ON {$cohortmemberalias}.userid = {$user}.id",
+                "LEFT JOIN {cohort} {$cohortalias} ON {$cohortalias}.id = {$cohortmemberalias}.cohortid",
+            ])
+        );
+
         // Join completion entity.
         $completionentity = (new completion())
             ->set_table_aliases([
@@ -138,7 +151,23 @@ protected function initialise(): void {
                        ON {$lastaccess}.userid = {$user}.id AND {$lastaccess}.courseid = {$course}.id"));
 
         // Add all entities columns/filters/conditions.
-        $this->add_all_from_entities();
+        $this->add_all_from_entities([
+            $courseentity->get_entity_name(),
+            $coursecatentity->get_entity_name(),
+            $enrolmententity->get_entity_name(),
+            $enrolentity->get_entity_name(),
+            $userentity->get_entity_name(),
+            $roleentity->get_entity_name(),
+            $groupentity->get_entity_name(),
+        ]);
+
+        $this->add_all_from_entity($cohortentity->get_entity_name(), ['name', 'idnumber', 'description', 'customfield*'],
+            ['cohortselect', 'name', 'idnumber', 'customfield*'], ['cohortselect', 'name', 'idnumber', 'customfield*']);
+
+        $this->add_all_from_entities([
+            $completionentity->get_entity_name(),
+            $accessentity->get_entity_name(),
+        ]);
     }
 
     /**
diff --git a/course/tests/reportbuilder/datasource/participants_test.php b/course/tests/reportbuilder/datasource/participants_test.php
index 4b3a760394bb3..a183b06e5d2d9 100644
--- a/course/tests/reportbuilder/datasource/participants_test.php
+++ b/course/tests/reportbuilder/datasource/participants_test.php
@@ -43,7 +43,7 @@
  * @copyright   2022 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class participants_test extends core_reportbuilder_testcase {
+final class participants_test extends core_reportbuilder_testcase {
 
     /**
      * Load required test libraries
@@ -141,6 +141,10 @@ public function test_datasource_non_default_columns(): void {
         $courseitem = grade_item::fetch_course_item($course->id);
         $courseitem->update_final_grade($user1->id, 42.5);
 
+        // Add some cohort data.
+        $cohort = $this->getDataGenerator()->create_cohort(['name' => 'My cohort']);
+        cohort_add_member($cohort->id, $user1->id);
+
         // Set some last access value for the user in the course.
         $DB->insert_record('user_lastaccess',
             ['userid' => $user1->id, 'courseid' => $course->id, 'timeaccess' => $timelastaccess]);
@@ -171,6 +175,7 @@ public function test_datasource_non_default_columns(): void {
 
         $generator->create_column(['reportid' => $report->get('id'),
             'uniqueidentifier' => 'group:name']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'cohort:name']);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'completion:criteria']);
         $generator->create_column(['reportid' => $report->get('id'),
             'uniqueidentifier' => 'completion:completed']);
@@ -193,15 +198,12 @@ public function test_datasource_non_default_columns(): void {
         $generator->create_column(['reportid' => $report->get('id'),
             'uniqueidentifier' => 'completion:grade']);
 
-        // Add filter to the report.
-        $generator->create_filter(['reportid' => $report->get('id'), 'uniqueidentifier' => 'enrol:plugin']);
-
-        $content = $this->get_custom_report_content($report->get('id'));
-
         // It should get 3 records (manual enrolment, self and guest).
+        $content = $this->get_custom_report_content($report->get('id'));
         $this->assertCount(3, $content);
 
         // Filter by Manual enrolment method.
+        $generator->create_filter(['reportid' => $report->get('id'), 'uniqueidentifier' => 'enrol:plugin']);
         $content = $this->get_custom_report_content($report->get('id'), 30, [
             'enrol:plugin_operator' => select::EQUAL_TO,
             'enrol:plugin_value' => 'manual',
@@ -223,6 +225,7 @@ public function test_datasource_non_default_columns(): void {
             'student', // Role shortname.
             'Students generally have fewer privileges within a course.', // Role description.
             $group->name, // Group name.
+            $cohort->name, // Cohort name.
             "All criteria below are required<ul>\n<li>Self completion: Self completion</li>\n</ul>", // Completion criteria.
             'Yes', // Course completed.
             userdate($timelastaccess), // Time last access.
@@ -242,7 +245,7 @@ public function test_datasource_non_default_columns(): void {
      *
      * @return array
      */
-    public function datasource_filters_provider(): array {
+    public static function datasource_filters_provider(): array {
         global $DB;
 
         return [
@@ -331,6 +334,22 @@ public function datasource_filters_provider(): array {
                 ],
                 ['Luna'],
             ],
+            [
+                'group:name',
+                [
+                    'group:name_operator' => text::IS_EQUAL_TO,
+                    'group:name_value' => 'My group',
+                ],
+                ['Lionel'],
+            ],
+            [
+                'cohort:name',
+                [
+                    'cohort:name_operator' => text::IS_EQUAL_TO,
+                    'cohort:name_value' => 'My cohort',
+                ],
+                ['Kira'],
+            ],
             [
                 'completion:completed',
                 [
@@ -407,6 +426,14 @@ public function test_datasource_filters(string $filter, array $filtervalues, arr
         $this->getDataGenerator()->enrol_user($user3->id, $course->id, 'editingteacher',
             'manual', time(), time(), ENROL_USER_SUSPENDED);
 
+        // Add user1 to a group.
+        $group = $this->getDataGenerator()->create_group(['courseid' => $course->id, 'name' => 'My group']);
+        $this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user1->id]);
+
+        // Add some cohort data.
+        $cohort = $this->getDataGenerator()->create_cohort(['name' => 'My cohort']);
+        cohort_add_member($cohort->id, $user2->id);
+
         // Mark course as completed for the user.
         $ccompletion = new completion_completion(array('course' => $course->id, 'userid' => $user1->id));
         $ccompletion->mark_enrolled($timestart);
diff --git a/reportbuilder/classes/datasource.php b/reportbuilder/classes/datasource.php
index 07a72762090da..9fa4d04a04c3c 100644
--- a/reportbuilder/classes/datasource.php
+++ b/reportbuilder/classes/datasource.php
@@ -400,10 +400,16 @@ final protected function add_all_from_entity(
 
     /**
      * Adds all columns/filters/conditions from all the entities added to the report at once
+     *
+     * @param string[] $entitynames If specified, then only these entity elements are added (otherwise all)
      */
-    final protected function add_all_from_entities(): void {
+    final protected function add_all_from_entities(array $entitynames = []): void {
         foreach ($this->get_entities() as $entity) {
-            $this->add_all_from_entity($entity->get_entity_name());
+            $entityname = $entity->get_entity_name();
+            if (!empty($entitynames) && array_search($entityname, $entitynames) === false) {
+                continue;
+            }
+            $this->add_all_from_entity($entityname);
         }
     }
 
diff --git a/reportbuilder/tests/datasource_test.php b/reportbuilder/tests/datasource_test.php
index f4057e8f9346c..58349409f246d 100644
--- a/reportbuilder/tests/datasource_test.php
+++ b/reportbuilder/tests/datasource_test.php
@@ -238,6 +238,56 @@ public function test_add_all_from_entity(): void {
         $this->assertNull($instance->get_condition('datasource_test_entity:extra2'));
     }
 
+    /**
+     * Data provider for {@see get_datasource_test_source}
+     *
+     * @return array[]
+     */
+    public static function add_all_from_entities_provider(): array {
+        return [
+            'All' => [
+                [],
+                9,
+                8,
+                8,
+            ],
+            'Entity' => [
+                ['datasource_test_entity'],
+                5,
+                4,
+                4,
+            ],
+        ];
+    }
+
+    /**
+     * Test adding from all entities
+     *
+     * @param string[] $entitynames
+     * @param int $expectedcountcolumns
+     * @param int $expectedcountfilters
+     * @param int $expectedcountconditions
+     *
+     * @covers ::add_all_from_entities
+     *
+     * @dataProvider add_all_from_entities_provider
+     */
+    public function test_add_all_from_entities(
+        array $entitynames,
+        int $expectedcountcolumns,
+        int $expectedcountfilters,
+        int $expectedcountconditions,
+    ): void {
+        $instance = $this->get_datasource_test_source();
+
+        $method = (new ReflectionClass($instance))->getMethod('add_all_from_entities');
+        $method->invoke($instance, $entitynames);
+
+        $this->assertCount($expectedcountcolumns, $instance->get_columns());
+        $this->assertCount($expectedcountfilters, $instance->get_filters());
+        $this->assertCount($expectedcountconditions, $instance->get_conditions());
+    }
+
     /**
      * Create and return our test datasource instance
      *
@@ -263,11 +313,14 @@ class datasource_test_source extends datasource {
 
     protected function initialise(): void {
         $this->set_main_table('user', 'u');
+
+        // Because we must have at least one column in the report.
         $this->annotate_entity('dummy', new lang_string('yes'));
         $this->add_column(new column('test', null, 'dummy'));
 
-        // This is the entity from which we'll add our report elements.
+        // These are the entities from which we'll add additional report elements.
         $this->add_entity(new datasource_test_entity());
+        $this->add_entity((new datasource_test_entity())->set_entity_name('datasource_test_entity_second'));
     }
 
     public static function get_name(): string {
diff --git a/reportbuilder/upgrade.txt b/reportbuilder/upgrade.txt
index 08c38f8fb3990..c7475e3412e66 100644
--- a/reportbuilder/upgrade.txt
+++ b/reportbuilder/upgrade.txt
@@ -1,6 +1,10 @@
 This file describes API changes in /reportbuilder/*
 Information provided here is intended especially for developers.
 
+=== 4.5 ===
+
+* The base datasource `add_all_from_entities` method accepts optional parameter to specify which entities to add elements from
+
 === 4.4 ===
 
 * New methods `get_identity_[columns|filters]` in user entity, for retrieving all user identity field report elements

From bfde1fe687c4f2edb51c835e27e834c18674d0cc Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 4 Apr 2024 14:26:27 +0100
Subject: [PATCH 47/75] MDL-81433 reportbuilder: return custom report tag data
 in WS calls.

---
 .../external/custom_report_details_exporter.php      |  6 ++++++
 .../external/custom_report_details_exporter_test.php |  9 +++++++--
 .../tests/external/reports/listing_test.php          | 12 ++++++++++--
 .../tests/external/reports/retrieve_test.php         |  8 ++++++--
 reportbuilder/upgrade.txt                            |  6 ++++++
 5 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/reportbuilder/classes/external/custom_report_details_exporter.php b/reportbuilder/classes/external/custom_report_details_exporter.php
index 1cf896987c52c..256b9248d6e18 100644
--- a/reportbuilder/classes/external/custom_report_details_exporter.php
+++ b/reportbuilder/classes/external/custom_report_details_exporter.php
@@ -24,6 +24,7 @@
 use core_reportbuilder\datasource;
 use core_reportbuilder\manager;
 use core_reportbuilder\local\models\report;
+use core_tag\external\{tag_item_exporter, util};
 use core_user\external\user_summary_exporter;
 
 /**
@@ -58,6 +59,10 @@ protected static function define_other_properties(): array {
                 'type' => PARAM_RAW,
                 'null' => NULL_ALLOWED,
             ],
+            'tags' => [
+                'type' => tag_item_exporter::read_properties_definition(),
+                'multiple' => true,
+            ],
             'modifiedby' => ['type' => user_summary_exporter::read_properties_definition()],
         ];
     }
@@ -74,6 +79,7 @@ protected function get_other_values(renderer_base $output): array {
 
         return [
             'sourcename' => manager::report_source_exists($source, datasource::class) ? $source::get_name() : null,
+            'tags' => util::get_item_tags('core_reportbuilder', 'reportbuilder_report', $this->persistent->get('id')),
             'modifiedby' => (new user_summary_exporter($usermodified))->export($output),
         ];
     }
diff --git a/reportbuilder/tests/external/custom_report_details_exporter_test.php b/reportbuilder/tests/external/custom_report_details_exporter_test.php
index 4e143003e8b68..2585e2d4c16e8 100644
--- a/reportbuilder/tests/external/custom_report_details_exporter_test.php
+++ b/reportbuilder/tests/external/custom_report_details_exporter_test.php
@@ -30,7 +30,7 @@
  * @copyright   2022 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class custom_report_details_exporter_test extends advanced_testcase {
+final class custom_report_details_exporter_test extends advanced_testcase {
 
     /**
      * Test exported data structure
@@ -45,7 +45,7 @@ public function test_export(): void {
 
         /** @var core_reportbuilder_generator $generator */
         $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
-        $report = $generator->create_report(['name' => 'My report', 'source' => users::class]);
+        $report = $generator->create_report(['name' => 'My report', 'source' => users::class, 'tags' => ['cat', 'dog']]);
 
         $exporter = new custom_report_details_exporter($report);
         $export = $exporter->export($PAGE->get_renderer('core_reportbuilder'));
@@ -55,8 +55,13 @@ public function test_export(): void {
         $this->assertEquals($report->get('source'), $export->source);
 
         // Source name should be the name of the source.
+        $this->assertObjectHasProperty('sourcename', $export);
         $this->assertEquals(users::get_name(), $export->sourcename);
 
+        // We use the tag exporter for report tags.
+        $this->assertObjectHasProperty('tags', $export);
+        $this->assertEquals(['cat', 'dog'], array_column($export->tags, 'name'));
+
         // We use the user exporter for the modifier of the report.
         $this->assertObjectHasProperty('modifiedby', $export);
         $this->assertEquals(fullname($user), $export->modifiedby->fullname);
diff --git a/reportbuilder/tests/external/reports/listing_test.php b/reportbuilder/tests/external/reports/listing_test.php
index 8325f6d448768..99f32ce0ec432 100644
--- a/reportbuilder/tests/external/reports/listing_test.php
+++ b/reportbuilder/tests/external/reports/listing_test.php
@@ -39,7 +39,7 @@
  * @copyright   2022 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class listing_test extends externallib_advanced_testcase {
+final class listing_test extends externallib_advanced_testcase {
 
     /**
      * Text execute method
@@ -52,7 +52,7 @@ public function test_execute(): void {
         $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
 
         // Create three reports.
-        $reportone = $generator->create_report(['name' => 'Report one', 'source' => users::class]);
+        $reportone = $generator->create_report(['name' => 'Report one', 'source' => users::class, 'tags' => ['cat', 'dog']]);
         $reporttwo = $generator->create_report(['name' => 'Report two', 'source' => users::class]);
         $reportthree = $generator->create_report(['name' => 'Report three', 'source' => users::class]);
 
@@ -67,7 +67,15 @@ public function test_execute(): void {
         $result = listing::execute();
         $result = external_api::clean_returnvalue(listing::execute_returns(), $result);
 
+        // All data is generated by exporters, just assert relevant sample of each.
         $this->assertEquals(['Report one', 'Report two'], array_column($result['reports'], 'name'));
+
+        $tagscolumn = array_column($result['reports'], 'tags');
+        $this->assertEquals([
+            ['cat', 'dog'],
+            [],
+        ], array_map(fn(array $tags) => array_column($tags, 'name'), $tagscolumn));
+
         $this->assertEmpty($result['warnings']);
     }
 
diff --git a/reportbuilder/tests/external/reports/retrieve_test.php b/reportbuilder/tests/external/reports/retrieve_test.php
index ac50ab448ac5d..9c27cfa5337cb 100644
--- a/reportbuilder/tests/external/reports/retrieve_test.php
+++ b/reportbuilder/tests/external/reports/retrieve_test.php
@@ -37,7 +37,7 @@
  * @copyright   2022 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class retrieve_test extends externallib_advanced_testcase {
+final class retrieve_test extends externallib_advanced_testcase {
 
     /**
      * Text execute method
@@ -52,7 +52,8 @@ public function test_execute(): void {
         /** @var core_reportbuilder_generator $generator */
         $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
 
-        $report = $generator->create_report(['name' => 'My report', 'source' => users::class, 'default' => false]);
+        $report = $generator->create_report(['name' => 'My report', 'source' => users::class, 'default' => false,
+            'tags' => ['cat', 'dog']]);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:fullname', 'sortenabled' => 1]);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:email']);
 
@@ -63,6 +64,7 @@ public function test_execute(): void {
         // All data is generated by exporters, just assert relevant sample of each.
         $this->assertArrayHasKey('details', $result);
         $this->assertEquals('My report', $result['details']['name']);
+        $this->assertEquals(['cat', 'dog'], array_column($result['details']['tags'], 'name'));
 
         $this->assertArrayHasKey('data', $result);
         $this->assertEquals(['Full name', 'Email address'], $result['data']['headers']);
@@ -81,8 +83,10 @@ public function test_execute(): void {
         $result = retrieve::execute($report->get('id'), 1, 2);
         $result = external_api::clean_returnvalue(retrieve::execute_returns(), $result);
 
+        // All data is generated by exporters, just assert relevant sample of each.
         $this->assertArrayHasKey('details', $result);
         $this->assertEquals('My report', $result['details']['name']);
+        $this->assertEquals(['cat', 'dog'], array_column($result['details']['tags'], 'name'));
 
         $this->assertArrayHasKey('data', $result);
         $this->assertEquals(['Full name', 'Email address'], $result['data']['headers']);
diff --git a/reportbuilder/upgrade.txt b/reportbuilder/upgrade.txt
index 08c38f8fb3990..42222b6f086eb 100644
--- a/reportbuilder/upgrade.txt
+++ b/reportbuilder/upgrade.txt
@@ -1,6 +1,12 @@
 This file describes API changes in /reportbuilder/*
 Information provided here is intended especially for developers.
 
+=== 4.5 ===
+
+* The following external methods now return tags data relevant to each custom report:
+  - `core_reportbuilder_list_reports`
+  - `core_reportbuilder_retrieve_report`
+
 === 4.4 ===
 
 * New methods `get_identity_[columns|filters]` in user entity, for retrieving all user identity field report elements

From ed42b2e92bd545b6aff72bf63f59b9b587c3e154 Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Tue, 30 Apr 2024 09:40:15 +1000
Subject: [PATCH 48/75] MDL-80571 tiny_premium: Premium plugins can be
 individually enabled

---
 .../premium/amd/build/configuration.min.js    |   2 +-
 .../amd/build/configuration.min.js.map        |   2 +-
 .../plugins/premium/amd/src/configuration.js  | 131 ++++++++-------
 .../admin_setting_tiny_premium_plugins.php    | 151 ++++++++++++++++++
 .../tiny/plugins/premium/classes/manager.php  | 109 +++++++++++++
 .../plugins/premium/classes/plugininfo.php    |  24 ++-
 .../tiny/plugins/premium/db/upgrade.php       |  55 +++++++
 .../plugins/premium/lang/en/tiny_premium.php  |  25 ++-
 .../tiny/plugins/premium/pluginsettings.php   |  74 +++++++++
 .../tiny/plugins/premium/readme_moodle.txt    |   9 +-
 lib/editor/tiny/plugins/premium/settings.php  |   4 +
 .../tests/behat/tiny_premium_settings.feature |  23 +++
 .../plugins/premium/tests/manager_test.php    |  73 +++++++++
 lib/editor/tiny/plugins/premium/version.php   |   2 +-
 14 files changed, 620 insertions(+), 64 deletions(-)
 create mode 100644 lib/editor/tiny/plugins/premium/classes/local/admin_setting_tiny_premium_plugins.php
 create mode 100644 lib/editor/tiny/plugins/premium/classes/manager.php
 create mode 100644 lib/editor/tiny/plugins/premium/db/upgrade.php
 create mode 100644 lib/editor/tiny/plugins/premium/pluginsettings.php
 create mode 100644 lib/editor/tiny/plugins/premium/tests/behat/tiny_premium_settings.feature
 create mode 100644 lib/editor/tiny/plugins/premium/tests/manager_test.php

diff --git a/lib/editor/tiny/plugins/premium/amd/build/configuration.min.js b/lib/editor/tiny/plugins/premium/amd/build/configuration.min.js
index 621fad27a73a5..c084ef3e6350f 100644
--- a/lib/editor/tiny/plugins/premium/amd/build/configuration.min.js
+++ b/lib/editor/tiny/plugins/premium/amd/build/configuration.min.js
@@ -1,3 +1,3 @@
-define("tiny_premium/configuration",["exports","editor_tiny/utils"],(function(_exports,_utils){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.configure=void 0;_exports.configure=instanceConfig=>{let plugins=instanceConfig.plugins,menu=instanceConfig.menu,toolbar=(toolbar=>(toolbar=(0,_utils.addToolbarSection)(toolbar,"premium_a","advanced",!0),(0,_utils.addToolbarSection)(toolbar,"premium_b","formatting",!0)))(instanceConfig.toolbar),contextmenu=instanceConfig.contextmenu;return plugins+=" advtable",menu=(0,_utils.addMenubarItem)(menu,"table","| advtablerownumbering","advtablesort"),plugins+=" editimage",toolbar=(0,_utils.addToolbarButton)(toolbar,"content","editimage","tiny_media_image"),instanceConfig.editimage_toolbar="rotateleft rotateright flipv fliph editimage",plugins+=" export",menu=(0,_utils.addMenubarItem)(menu,"tools","| export"),plugins+=" pageembed",toolbar=(0,_utils.addToolbarButton)(toolbar,"content","pageembed","tiny_media_video"),plugins+=" typography",toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_b","typography"),plugins+=" casechange",toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","casechange"),plugins+=" checklist",toolbar=(0,_utils.addToolbarButton)(toolbar,"lists","checklist"),plugins+=" tinymcespellchecker",menu=(0,_utils.addMenubarItem)(menu,"tools","spellcheckdialog","spellcheckerlanguage"),contextmenu=(0,_utils.addContextmenuItem)(contextmenu,"spellchecker"),toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","spellcheckdialog"),plugins+=" autocorrect",menu=(0,_utils.addMenubarItem)(menu,"tools","| autocorrect capitalization","spellcheckdialog"),plugins+=" permanentpen",menu=(0,_utils.addMenubarItem)(menu,"format","| permanentpen configurepermanentpen"),toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","permanentpen"),contextmenu=(0,_utils.addContextmenuItem)(contextmenu,"configurepermanentpen"),plugins+=" formatpainter",toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","formatpainter"),plugins+=" linkchecker",contextmenu=(0,_utils.addContextmenuItem)(contextmenu,"linkchecker"),plugins+=" tableofcontents",toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","tableofcontents"),plugins+=" footnotes",toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","footnotes"),menu=(0,_utils.addMenubarItem)(menu,"insert","footnotes","tableofcontents"),plugins+=" powerpaste",{plugins:plugins,toolbar:toolbar,menu:menu,contextmenu:contextmenu}}}));
+define("tiny_premium/configuration",["exports","editor_tiny/utils","editor_tiny/options"],(function(_exports,_utils,_options){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.configure=void 0;_exports.configure=(instanceConfig,options)=>{const enabledPremiumPlugins=(0,_options.getInitialPluginConfiguration)(options)[(0,_options.getPluginOptionName)("tiny_premium/plugin","premiumplugins")].split(",");let plugins=instanceConfig.plugins,menu=instanceConfig.menu,toolbar=(toolbar=>(toolbar=(0,_utils.addToolbarSection)(toolbar,"premium_a","advanced",!0),(0,_utils.addToolbarSection)(toolbar,"premium_b","formatting",!0)))(instanceConfig.toolbar),contextmenu=instanceConfig.contextmenu;return-1!==enabledPremiumPlugins.indexOf("advtable")&&(plugins+=" advtable",menu=(0,_utils.addMenubarItem)(menu,"table","| advtablerownumbering","advtablesort")),-1!==enabledPremiumPlugins.indexOf("editimage")&&(plugins+=" editimage",toolbar=(0,_utils.addToolbarButton)(toolbar,"content","editimage","tiny_media_image"),instanceConfig.editimage_toolbar="rotateleft rotateright flipv fliph editimage"),-1!==enabledPremiumPlugins.indexOf("export")&&(plugins+=" export",menu=(0,_utils.addMenubarItem)(menu,"tools","| export")),-1!==enabledPremiumPlugins.indexOf("pageembed")&&(plugins+=" pageembed",toolbar=(0,_utils.addToolbarButton)(toolbar,"content","pageembed","tiny_media_video")),-1!==enabledPremiumPlugins.indexOf("typography")&&(plugins+=" typography",toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_b","typography")),-1!==enabledPremiumPlugins.indexOf("casechange")&&(plugins+=" casechange",toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","casechange")),-1!==enabledPremiumPlugins.indexOf("checklist")&&(plugins+=" checklist",toolbar=(0,_utils.addToolbarButton)(toolbar,"lists","checklist")),-1!==enabledPremiumPlugins.indexOf("tinymcespellchecker")&&(plugins+=" tinymcespellchecker",menu=(0,_utils.addMenubarItem)(menu,"tools","spellcheckdialog","spellcheckerlanguage"),contextmenu=(0,_utils.addContextmenuItem)(contextmenu,"spellchecker"),toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","spellcheckdialog")),-1!==enabledPremiumPlugins.indexOf("autocorrect")&&(plugins+=" autocorrect",menu=(0,_utils.addMenubarItem)(menu,"tools","| autocorrect capitalization","spellcheckdialog")),-1!==enabledPremiumPlugins.indexOf("permanentpen")&&(plugins+=" permanentpen",menu=(0,_utils.addMenubarItem)(menu,"format","| permanentpen configurepermanentpen"),toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","permanentpen"),contextmenu=(0,_utils.addContextmenuItem)(contextmenu,"configurepermanentpen")),-1!==enabledPremiumPlugins.indexOf("formatpainter")&&(plugins+=" formatpainter",toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","formatpainter")),-1!==enabledPremiumPlugins.indexOf("linkchecker")&&(plugins+=" linkchecker",contextmenu=(0,_utils.addContextmenuItem)(contextmenu,"linkchecker")),-1!==enabledPremiumPlugins.indexOf("tableofcontents")&&(plugins+=" tableofcontents",toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","tableofcontents")),-1!==enabledPremiumPlugins.indexOf("footnotes")&&(plugins+=" footnotes",toolbar=(0,_utils.addToolbarButton)(toolbar,"premium_a","footnotes"),menu=(0,_utils.addMenubarItem)(menu,"insert","footnotes","tableofcontents")),-1!==enabledPremiumPlugins.indexOf("powerpaste")&&(plugins+=" powerpaste"),{plugins:plugins,toolbar:toolbar,menu:menu,contextmenu:contextmenu}}}));
 
 //# sourceMappingURL=configuration.min.js.map
\ No newline at end of file
diff --git a/lib/editor/tiny/plugins/premium/amd/build/configuration.min.js.map b/lib/editor/tiny/plugins/premium/amd/build/configuration.min.js.map
index ca798b5a1b989..404d85db577f9 100644
--- a/lib/editor/tiny/plugins/premium/amd/build/configuration.min.js.map
+++ b/lib/editor/tiny/plugins/premium/amd/build/configuration.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"configuration.min.js","sources":["../src/configuration.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Tiny Premium configuration.\n *\n * @module      tiny_premium/configuration\n * @copyright   2023 David Woloszyn <david.woloszyn@moodle.com>\n * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {\n    addToolbarButton,\n    addMenubarItem,\n    addToolbarSection,\n    addContextmenuItem\n} from 'editor_tiny/utils';\n\nconst configureToolbar = (toolbar) => {\n    // Add premium toolbar sections to house all the plugins with no natural home.\n    toolbar = addToolbarSection(toolbar, 'premium_a', 'advanced', true);\n    toolbar = addToolbarSection(toolbar, 'premium_b', 'formatting', true);\n    return toolbar;\n};\n\nexport const configure = (instanceConfig) => {\n    // There is some manipulating of the plugin menu, toolbar, context and quickbar items.\n    // This was necessary to enhance user experience and closer align to the Tiny demo site.\n    let plugins = instanceConfig.plugins;\n    let menu = instanceConfig.menu;\n    let toolbar = configureToolbar(instanceConfig.toolbar);\n    let contextmenu = instanceConfig.contextmenu;\n    let pluginsettings = {};\n\n    // Advanced Table.\n    plugins += ` advtable`;\n    menu = addMenubarItem(menu, 'table', '| advtablerownumbering', 'advtablesort');\n\n    // Enhanced Image Editing.\n    plugins += ` editimage`;\n    toolbar = addToolbarButton(toolbar, 'content', 'editimage', 'tiny_media_image');\n    // Remove the duplicate image button from the quickbar toolbar by redefining the values without 'imageoptions'.\n    // eslint-disable-next-line camelcase\n    instanceConfig.editimage_toolbar = 'rotateleft rotateright flipv fliph editimage';\n\n    // Export.\n    plugins += ` export`;\n    menu = addMenubarItem(menu, 'tools', '| export');\n\n    // Page Embed.\n    plugins += ` pageembed`;\n    toolbar = addToolbarButton(toolbar, 'content', 'pageembed', 'tiny_media_video');\n\n    // Advanced Typography.\n    plugins += ` typography`;\n    toolbar = addToolbarButton(toolbar, 'premium_b', 'typography');\n\n    // Case Change.\n    plugins += ` casechange`;\n    toolbar = addToolbarButton(toolbar, 'premium_a', 'casechange');\n\n    // Checklist.\n    plugins += ` checklist`;\n    toolbar = addToolbarButton(toolbar, 'lists', 'checklist');\n\n    // Spell Checker Pro.\n    plugins += ` tinymcespellchecker`;\n    menu = addMenubarItem(menu, 'tools', 'spellcheckdialog', 'spellcheckerlanguage');\n    contextmenu = addContextmenuItem(contextmenu, 'spellchecker');\n    toolbar = addToolbarButton(toolbar, 'premium_a', 'spellcheckdialog');\n\n    // Spelling Autocorrect.\n    plugins += ` autocorrect`;\n    menu = addMenubarItem(menu, 'tools', '| autocorrect capitalization', 'spellcheckdialog');\n\n    // Permanent Pen.\n    plugins += ` permanentpen`;\n    menu = addMenubarItem(menu, 'format', '| permanentpen configurepermanentpen');\n    toolbar = addToolbarButton(toolbar, 'premium_a', 'permanentpen');\n    contextmenu = addContextmenuItem(contextmenu, 'configurepermanentpen');\n\n    // Format Painter.\n    plugins += ` formatpainter`;\n    toolbar = addToolbarButton(toolbar, 'premium_a', 'formatpainter');\n\n    // Link Checker.\n    plugins += ` linkchecker`;\n    contextmenu = addContextmenuItem(contextmenu, 'linkchecker');\n\n    // Table of Contents.\n    plugins += ` tableofcontents`;\n    toolbar = addToolbarButton(toolbar, 'premium_a', 'tableofcontents');\n\n    // Footnotes.\n    plugins += ` footnotes`;\n    toolbar = addToolbarButton(toolbar, 'premium_a', 'footnotes');\n    menu = addMenubarItem(menu, 'insert', 'footnotes', 'tableofcontents');\n\n    // Powerpaste.\n    plugins += ` powerpaste`;\n\n    return {\n        plugins,\n        toolbar,\n        menu,\n        contextmenu,\n        ...pluginsettings\n    };\n};\n"],"names":["instanceConfig","plugins","menu","toolbar","configureToolbar","contextmenu","editimage_toolbar"],"mappings":"oMAqC0BA,qBAGlBC,QAAUD,eAAeC,QACzBC,KAAOF,eAAeE,KACtBC,QAZkBA,CAAAA,UAEtBA,SAAU,4BAAkBA,QAAS,YAAa,YAAY,IACpD,4BAAkBA,QAAS,YAAa,cAAc,IASlDC,CAAiBJ,eAAeG,SAC1CE,YAAcL,eAAeK,mBAIjCJ,qBACAC,MAAO,yBAAeA,KAAM,QAAS,yBAA0B,gBAG/DD,sBACAE,SAAU,2BAAiBA,QAAS,UAAW,YAAa,oBAG5DH,eAAeM,kBAAoB,+CAGnCL,mBACAC,MAAO,yBAAeA,KAAM,QAAS,YAGrCD,sBACAE,SAAU,2BAAiBA,QAAS,UAAW,YAAa,oBAG5DF,uBACAE,SAAU,2BAAiBA,QAAS,YAAa,cAGjDF,uBACAE,SAAU,2BAAiBA,QAAS,YAAa,cAGjDF,sBACAE,SAAU,2BAAiBA,QAAS,QAAS,aAG7CF,gCACAC,MAAO,yBAAeA,KAAM,QAAS,mBAAoB,wBACzDG,aAAc,6BAAmBA,YAAa,gBAC9CF,SAAU,2BAAiBA,QAAS,YAAa,oBAGjDF,wBACAC,MAAO,yBAAeA,KAAM,QAAS,+BAAgC,oBAGrED,yBACAC,MAAO,yBAAeA,KAAM,SAAU,wCACtCC,SAAU,2BAAiBA,QAAS,YAAa,gBACjDE,aAAc,6BAAmBA,YAAa,yBAG9CJ,0BACAE,SAAU,2BAAiBA,QAAS,YAAa,iBAGjDF,wBACAI,aAAc,6BAAmBA,YAAa,eAG9CJ,4BACAE,SAAU,2BAAiBA,QAAS,YAAa,mBAGjDF,sBACAE,SAAU,2BAAiBA,QAAS,YAAa,aACjDD,MAAO,yBAAeA,KAAM,SAAU,YAAa,mBAGnDD,uBAEO,CACHA,QAAAA,QACAE,QAAAA,QACAD,KAAAA,KACAG,YAAAA"}
\ No newline at end of file
+{"version":3,"file":"configuration.min.js","sources":["../src/configuration.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Tiny Premium configuration.\n *\n * @module      tiny_premium/configuration\n * @copyright   2023 David Woloszyn <david.woloszyn@moodle.com>\n * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {\n    addToolbarButton,\n    addMenubarItem,\n    addToolbarSection,\n    addContextmenuItem\n} from 'editor_tiny/utils';\nimport {\n    getInitialPluginConfiguration,\n    getPluginOptionName\n} from 'editor_tiny/options';\n\nconst configureToolbar = (toolbar) => {\n    // Add premium toolbar sections to house all the plugins with no natural home.\n    toolbar = addToolbarSection(toolbar, 'premium_a', 'advanced', true);\n    toolbar = addToolbarSection(toolbar, 'premium_b', 'formatting', true);\n    return toolbar;\n};\n\nexport const configure = (instanceConfig, options) => {\n    // Get the namespaced options for Tiny Premium before they are officially initialised.\n    // Due to the timing the plugin options are available, we need to get at the options in this slightly unconventional way.\n    const pluginOptions = getInitialPluginConfiguration(options);\n    const enabledPremiumPlugins = pluginOptions[getPluginOptionName('tiny_premium/plugin', 'premiumplugins')].split(',');\n\n    let plugins = instanceConfig.plugins;\n    let menu = instanceConfig.menu;\n    let toolbar = configureToolbar(instanceConfig.toolbar);\n    let contextmenu = instanceConfig.contextmenu;\n    let pluginsettings = {};\n\n    // Advanced Table.\n    if (enabledPremiumPlugins.indexOf('advtable') !== -1) {\n        plugins += ` advtable`;\n        menu = addMenubarItem(menu, 'table', '| advtablerownumbering', 'advtablesort');\n    }\n    // Enhanced Image Editing.\n    if (enabledPremiumPlugins.indexOf('editimage') !== -1) {\n        plugins += ` editimage`;\n        toolbar = addToolbarButton(toolbar, 'content', 'editimage', 'tiny_media_image');\n        // Remove the duplicate image button from the quickbar toolbar by redefining the values without 'imageoptions'.\n        // eslint-disable-next-line camelcase\n        instanceConfig.editimage_toolbar = 'rotateleft rotateright flipv fliph editimage';\n    }\n    // Export.\n    if (enabledPremiumPlugins.indexOf('export') !== -1) {\n        plugins += ` export`;\n        menu = addMenubarItem(menu, 'tools', '| export');\n    }\n    // Page Embed.\n    if (enabledPremiumPlugins.indexOf('pageembed') !== -1) {\n        plugins += ` pageembed`;\n        toolbar = addToolbarButton(toolbar, 'content', 'pageembed', 'tiny_media_video');\n    }\n    // Advanced Typography.\n    if (enabledPremiumPlugins.indexOf('typography') !== -1) {\n        plugins += ` typography`;\n        toolbar = addToolbarButton(toolbar, 'premium_b', 'typography');\n    }\n    // Case Change.\n    if (enabledPremiumPlugins.indexOf('casechange') !== -1) {\n        plugins += ` casechange`;\n        toolbar = addToolbarButton(toolbar, 'premium_a', 'casechange');\n    }\n    // Checklist.\n    if (enabledPremiumPlugins.indexOf('checklist') !== -1) {\n        plugins += ` checklist`;\n        toolbar = addToolbarButton(toolbar, 'lists', 'checklist');\n    }\n    // Spell Checker Pro.\n    if (enabledPremiumPlugins.indexOf('tinymcespellchecker') !== -1) {\n        plugins += ` tinymcespellchecker`;\n        menu = addMenubarItem(menu, 'tools', 'spellcheckdialog', 'spellcheckerlanguage');\n        contextmenu = addContextmenuItem(contextmenu, 'spellchecker');\n        toolbar = addToolbarButton(toolbar, 'premium_a', 'spellcheckdialog');\n    }\n    // Spelling Autocorrect.\n    if (enabledPremiumPlugins.indexOf('autocorrect') !== -1) {\n        plugins += ` autocorrect`;\n        menu = addMenubarItem(menu, 'tools', '| autocorrect capitalization', 'spellcheckdialog');\n    }\n    // Permanent Pen.\n    if (enabledPremiumPlugins.indexOf('permanentpen') !== -1) {\n        plugins += ` permanentpen`;\n        menu = addMenubarItem(menu, 'format', '| permanentpen configurepermanentpen');\n        toolbar = addToolbarButton(toolbar, 'premium_a', 'permanentpen');\n        contextmenu = addContextmenuItem(contextmenu, 'configurepermanentpen');\n    }\n    // Format Painter.\n    if (enabledPremiumPlugins.indexOf('formatpainter') !== -1) {\n        plugins += ` formatpainter`;\n        toolbar = addToolbarButton(toolbar, 'premium_a', 'formatpainter');\n    }\n    // Link Checker.\n    if (enabledPremiumPlugins.indexOf('linkchecker') !== -1) {\n        plugins += ` linkchecker`;\n        contextmenu = addContextmenuItem(contextmenu, 'linkchecker');\n    }\n    // Table of Contents.\n    if (enabledPremiumPlugins.indexOf('tableofcontents') !== -1) {\n        plugins += ` tableofcontents`;\n        toolbar = addToolbarButton(toolbar, 'premium_a', 'tableofcontents');\n    }\n    // Footnotes.\n    if (enabledPremiumPlugins.indexOf('footnotes') !== -1) {\n        plugins += ` footnotes`;\n        toolbar = addToolbarButton(toolbar, 'premium_a', 'footnotes');\n        menu = addMenubarItem(menu, 'insert', 'footnotes', 'tableofcontents');\n    }\n    // Powerpaste.\n    if (enabledPremiumPlugins.indexOf('powerpaste') !== -1) {\n        plugins += ` powerpaste`;\n    }\n\n    return {\n        plugins,\n        toolbar,\n        menu,\n        contextmenu,\n        ...pluginsettings\n    };\n};\n"],"names":["instanceConfig","options","enabledPremiumPlugins","split","plugins","menu","toolbar","configureToolbar","contextmenu","indexOf","editimage_toolbar"],"mappings":"mOAyCyB,CAACA,eAAgBC,iBAIhCC,uBADgB,0CAA8BD,UACR,gCAAoB,sBAAuB,mBAAmBE,MAAM,SAE5GC,QAAUJ,eAAeI,QACzBC,KAAOL,eAAeK,KACtBC,QAfkBA,CAAAA,UAEtBA,SAAU,4BAAkBA,QAAS,YAAa,YAAY,IACpD,4BAAkBA,QAAS,YAAa,cAAc,IAYlDC,CAAiBP,eAAeM,SAC1CE,YAAcR,eAAeQ,mBAIkB,IAA/CN,sBAAsBO,QAAQ,cAC9BL,qBACAC,MAAO,yBAAeA,KAAM,QAAS,yBAA0B,kBAGf,IAAhDH,sBAAsBO,QAAQ,eAC9BL,sBACAE,SAAU,2BAAiBA,QAAS,UAAW,YAAa,oBAG5DN,eAAeU,kBAAoB,iDAGU,IAA7CR,sBAAsBO,QAAQ,YAC9BL,mBACAC,MAAO,yBAAeA,KAAM,QAAS,cAGW,IAAhDH,sBAAsBO,QAAQ,eAC9BL,sBACAE,SAAU,2BAAiBA,QAAS,UAAW,YAAa,sBAGX,IAAjDJ,sBAAsBO,QAAQ,gBAC9BL,uBACAE,SAAU,2BAAiBA,QAAS,YAAa,gBAGA,IAAjDJ,sBAAsBO,QAAQ,gBAC9BL,uBACAE,SAAU,2BAAiBA,QAAS,YAAa,gBAGD,IAAhDJ,sBAAsBO,QAAQ,eAC9BL,sBACAE,SAAU,2BAAiBA,QAAS,QAAS,eAGa,IAA1DJ,sBAAsBO,QAAQ,yBAC9BL,gCACAC,MAAO,yBAAeA,KAAM,QAAS,mBAAoB,wBACzDG,aAAc,6BAAmBA,YAAa,gBAC9CF,SAAU,2BAAiBA,QAAS,YAAa,sBAGC,IAAlDJ,sBAAsBO,QAAQ,iBAC9BL,wBACAC,MAAO,yBAAeA,KAAM,QAAS,+BAAgC,sBAGlB,IAAnDH,sBAAsBO,QAAQ,kBAC9BL,yBACAC,MAAO,yBAAeA,KAAM,SAAU,wCACtCC,SAAU,2BAAiBA,QAAS,YAAa,gBACjDE,aAAc,6BAAmBA,YAAa,2BAGM,IAApDN,sBAAsBO,QAAQ,mBAC9BL,0BACAE,SAAU,2BAAiBA,QAAS,YAAa,mBAGC,IAAlDJ,sBAAsBO,QAAQ,iBAC9BL,wBACAI,aAAc,6BAAmBA,YAAa,iBAGQ,IAAtDN,sBAAsBO,QAAQ,qBAC9BL,4BACAE,SAAU,2BAAiBA,QAAS,YAAa,qBAGD,IAAhDJ,sBAAsBO,QAAQ,eAC9BL,sBACAE,SAAU,2BAAiBA,QAAS,YAAa,aACjDD,MAAO,yBAAeA,KAAM,SAAU,YAAa,qBAGF,IAAjDH,sBAAsBO,QAAQ,gBAC9BL,wBAGG,CACHA,QAAAA,QACAE,QAAAA,QACAD,KAAAA,KACAG,YAAAA"}
\ No newline at end of file
diff --git a/lib/editor/tiny/plugins/premium/amd/src/configuration.js b/lib/editor/tiny/plugins/premium/amd/src/configuration.js
index 1b2cfa7e14c57..6b5f9460acadb 100644
--- a/lib/editor/tiny/plugins/premium/amd/src/configuration.js
+++ b/lib/editor/tiny/plugins/premium/amd/src/configuration.js
@@ -27,6 +27,10 @@ import {
     addToolbarSection,
     addContextmenuItem
 } from 'editor_tiny/utils';
+import {
+    getInitialPluginConfiguration,
+    getPluginOptionName
+} from 'editor_tiny/options';
 
 const configureToolbar = (toolbar) => {
     // Add premium toolbar sections to house all the plugins with no natural home.
@@ -35,9 +39,12 @@ const configureToolbar = (toolbar) => {
     return toolbar;
 };
 
-export const configure = (instanceConfig) => {
-    // There is some manipulating of the plugin menu, toolbar, context and quickbar items.
-    // This was necessary to enhance user experience and closer align to the Tiny demo site.
+export const configure = (instanceConfig, options) => {
+    // Get the namespaced options for Tiny Premium before they are officially initialised.
+    // Due to the timing the plugin options are available, we need to get at the options in this slightly unconventional way.
+    const pluginOptions = getInitialPluginConfiguration(options);
+    const enabledPremiumPlugins = pluginOptions[getPluginOptionName('tiny_premium/plugin', 'premiumplugins')].split(',');
+
     let plugins = instanceConfig.plugins;
     let menu = instanceConfig.menu;
     let toolbar = configureToolbar(instanceConfig.toolbar);
@@ -45,71 +52,87 @@ export const configure = (instanceConfig) => {
     let pluginsettings = {};
 
     // Advanced Table.
-    plugins += ` advtable`;
-    menu = addMenubarItem(menu, 'table', '| advtablerownumbering', 'advtablesort');
-
+    if (enabledPremiumPlugins.indexOf('advtable') !== -1) {
+        plugins += ` advtable`;
+        menu = addMenubarItem(menu, 'table', '| advtablerownumbering', 'advtablesort');
+    }
     // Enhanced Image Editing.
-    plugins += ` editimage`;
-    toolbar = addToolbarButton(toolbar, 'content', 'editimage', 'tiny_media_image');
-    // Remove the duplicate image button from the quickbar toolbar by redefining the values without 'imageoptions'.
-    // eslint-disable-next-line camelcase
-    instanceConfig.editimage_toolbar = 'rotateleft rotateright flipv fliph editimage';
-
+    if (enabledPremiumPlugins.indexOf('editimage') !== -1) {
+        plugins += ` editimage`;
+        toolbar = addToolbarButton(toolbar, 'content', 'editimage', 'tiny_media_image');
+        // Remove the duplicate image button from the quickbar toolbar by redefining the values without 'imageoptions'.
+        // eslint-disable-next-line camelcase
+        instanceConfig.editimage_toolbar = 'rotateleft rotateright flipv fliph editimage';
+    }
     // Export.
-    plugins += ` export`;
-    menu = addMenubarItem(menu, 'tools', '| export');
-
+    if (enabledPremiumPlugins.indexOf('export') !== -1) {
+        plugins += ` export`;
+        menu = addMenubarItem(menu, 'tools', '| export');
+    }
     // Page Embed.
-    plugins += ` pageembed`;
-    toolbar = addToolbarButton(toolbar, 'content', 'pageembed', 'tiny_media_video');
-
+    if (enabledPremiumPlugins.indexOf('pageembed') !== -1) {
+        plugins += ` pageembed`;
+        toolbar = addToolbarButton(toolbar, 'content', 'pageembed', 'tiny_media_video');
+    }
     // Advanced Typography.
-    plugins += ` typography`;
-    toolbar = addToolbarButton(toolbar, 'premium_b', 'typography');
-
+    if (enabledPremiumPlugins.indexOf('typography') !== -1) {
+        plugins += ` typography`;
+        toolbar = addToolbarButton(toolbar, 'premium_b', 'typography');
+    }
     // Case Change.
-    plugins += ` casechange`;
-    toolbar = addToolbarButton(toolbar, 'premium_a', 'casechange');
-
+    if (enabledPremiumPlugins.indexOf('casechange') !== -1) {
+        plugins += ` casechange`;
+        toolbar = addToolbarButton(toolbar, 'premium_a', 'casechange');
+    }
     // Checklist.
-    plugins += ` checklist`;
-    toolbar = addToolbarButton(toolbar, 'lists', 'checklist');
-
+    if (enabledPremiumPlugins.indexOf('checklist') !== -1) {
+        plugins += ` checklist`;
+        toolbar = addToolbarButton(toolbar, 'lists', 'checklist');
+    }
     // Spell Checker Pro.
-    plugins += ` tinymcespellchecker`;
-    menu = addMenubarItem(menu, 'tools', 'spellcheckdialog', 'spellcheckerlanguage');
-    contextmenu = addContextmenuItem(contextmenu, 'spellchecker');
-    toolbar = addToolbarButton(toolbar, 'premium_a', 'spellcheckdialog');
-
+    if (enabledPremiumPlugins.indexOf('tinymcespellchecker') !== -1) {
+        plugins += ` tinymcespellchecker`;
+        menu = addMenubarItem(menu, 'tools', 'spellcheckdialog', 'spellcheckerlanguage');
+        contextmenu = addContextmenuItem(contextmenu, 'spellchecker');
+        toolbar = addToolbarButton(toolbar, 'premium_a', 'spellcheckdialog');
+    }
     // Spelling Autocorrect.
-    plugins += ` autocorrect`;
-    menu = addMenubarItem(menu, 'tools', '| autocorrect capitalization', 'spellcheckdialog');
-
+    if (enabledPremiumPlugins.indexOf('autocorrect') !== -1) {
+        plugins += ` autocorrect`;
+        menu = addMenubarItem(menu, 'tools', '| autocorrect capitalization', 'spellcheckdialog');
+    }
     // Permanent Pen.
-    plugins += ` permanentpen`;
-    menu = addMenubarItem(menu, 'format', '| permanentpen configurepermanentpen');
-    toolbar = addToolbarButton(toolbar, 'premium_a', 'permanentpen');
-    contextmenu = addContextmenuItem(contextmenu, 'configurepermanentpen');
-
+    if (enabledPremiumPlugins.indexOf('permanentpen') !== -1) {
+        plugins += ` permanentpen`;
+        menu = addMenubarItem(menu, 'format', '| permanentpen configurepermanentpen');
+        toolbar = addToolbarButton(toolbar, 'premium_a', 'permanentpen');
+        contextmenu = addContextmenuItem(contextmenu, 'configurepermanentpen');
+    }
     // Format Painter.
-    plugins += ` formatpainter`;
-    toolbar = addToolbarButton(toolbar, 'premium_a', 'formatpainter');
-
+    if (enabledPremiumPlugins.indexOf('formatpainter') !== -1) {
+        plugins += ` formatpainter`;
+        toolbar = addToolbarButton(toolbar, 'premium_a', 'formatpainter');
+    }
     // Link Checker.
-    plugins += ` linkchecker`;
-    contextmenu = addContextmenuItem(contextmenu, 'linkchecker');
-
+    if (enabledPremiumPlugins.indexOf('linkchecker') !== -1) {
+        plugins += ` linkchecker`;
+        contextmenu = addContextmenuItem(contextmenu, 'linkchecker');
+    }
     // Table of Contents.
-    plugins += ` tableofcontents`;
-    toolbar = addToolbarButton(toolbar, 'premium_a', 'tableofcontents');
-
+    if (enabledPremiumPlugins.indexOf('tableofcontents') !== -1) {
+        plugins += ` tableofcontents`;
+        toolbar = addToolbarButton(toolbar, 'premium_a', 'tableofcontents');
+    }
     // Footnotes.
-    plugins += ` footnotes`;
-    toolbar = addToolbarButton(toolbar, 'premium_a', 'footnotes');
-    menu = addMenubarItem(menu, 'insert', 'footnotes', 'tableofcontents');
-
+    if (enabledPremiumPlugins.indexOf('footnotes') !== -1) {
+        plugins += ` footnotes`;
+        toolbar = addToolbarButton(toolbar, 'premium_a', 'footnotes');
+        menu = addMenubarItem(menu, 'insert', 'footnotes', 'tableofcontents');
+    }
     // Powerpaste.
-    plugins += ` powerpaste`;
+    if (enabledPremiumPlugins.indexOf('powerpaste') !== -1) {
+        plugins += ` powerpaste`;
+    }
 
     return {
         plugins,
diff --git a/lib/editor/tiny/plugins/premium/classes/local/admin_setting_tiny_premium_plugins.php b/lib/editor/tiny/plugins/premium/classes/local/admin_setting_tiny_premium_plugins.php
new file mode 100644
index 0000000000000..0a1c78af70087
--- /dev/null
+++ b/lib/editor/tiny/plugins/premium/classes/local/admin_setting_tiny_premium_plugins.php
@@ -0,0 +1,151 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace tiny_premium\local;
+
+use tiny_premium\manager;
+
+/**
+ * Admin setting for managing Tiny Premium plugins.
+ *
+ * @package    tiny_premium
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class admin_setting_tiny_premium_plugins extends \admin_setting {
+
+    /**
+     * Calls parent::__construct with specific arguments.
+     */
+    public function __construct() {
+        $this->nosave = true;
+        parent::__construct(
+            name: 'tiny_premium/premiumplugins',
+            visiblename: new \lang_string('premiumplugins', 'tiny_premium'),
+            description: new \lang_string('premiumplugins_desc', 'tiny_premium'),
+            defaultsetting: '',
+        );
+    }
+
+    /**
+     * Always returns true.
+     *
+     * @return bool
+     */
+    public function get_setting(): bool {
+        return true;
+    }
+
+    /**
+     * Always returns '' and doesn't write anything.
+     *
+     * @param mixed $data
+     * @return string Always returns ''
+     */
+    public function write_setting($data): string {
+        return '';
+    }
+
+    /**
+     * Builds the HTML to display the Tiny Premium plugins table.
+     *
+     * @param mixed $data Unused
+     * @param string $query
+     * @return string highlight
+     */
+    public function output_html($data, $query=''): string {
+        global $OUTPUT;
+
+        $return = '';
+
+        // Warn users about an empty API key when displaying enabled plugins.
+        if (empty(get_config('tiny_premium', 'apikey')) && !empty(manager::get_enabled_plugins())) {
+            $return .= \core\notification::warning(get_string('emptyapikeywarning', 'tiny_premium'));
+        }
+
+        $return .= $OUTPUT->box_start('generalbox');
+        $return .= $OUTPUT->heading(get_string('premiumplugins', 'tiny_premium'), 3);
+        $return .= \html_writer::tag('p', get_string('premiumplugins_desc', 'tiny_premium'));
+        $return .= $this->define_manage_tiny_premium_plugins_table();
+        $return .= $OUTPUT->box_end();
+
+        return highlight($query, $return);
+    }
+
+    /**
+     * Defines table for managing Tiny Premium plugins.
+     *
+     * @return string HTML for table
+     */
+    public function define_manage_tiny_premium_plugins_table(): string {
+        global $OUTPUT;
+        $sesskey = sesskey();
+
+        // Set up table.
+        $table = new \html_table();
+        $table->id = 'managetinypremiumpluginstable';
+        $table->attributes['class'] = 'admintable generaltable';
+        $table->head  = [
+            get_string('name'),
+            get_string('enable'),
+        ];
+        $table->colclasses = [
+            'leftalign',
+            'centeralign',
+        ];
+        $table->data  = [];
+
+        // Keep enabled plugins on top.
+        $plugins = manager::get_plugins();
+        $enabledplugins = manager::get_enabled_plugins();
+        $disabledplugins = array_diff($plugins, $enabledplugins);
+        $plugins = array_merge($enabledplugins, $disabledplugins);
+
+        foreach ($plugins as $plugin) {
+
+            $pluginname = get_string('premiumplugin:' . $plugin, 'tiny_premium');
+
+            // Determine plugin actions.
+            if (manager::is_plugin_enabled($plugin)) {
+                $action = 'disable';
+                $icon = $OUTPUT->pix_icon('t/hide', get_string('disableplugin', 'core_admin', $pluginname));
+                $class = '';
+            } else {
+                $action = 'enable';
+                $icon = $OUTPUT->pix_icon('t/show', get_string('enableplugin', 'core_admin', $pluginname));
+                $class = 'dimmed_text';
+            }
+
+            // Prepare a link to perform the action.
+            $hideshowurl = new \moodle_url('/lib/editor/tiny/plugins/premium/pluginsettings.php', [
+                'action' => $action,
+                'plugin' => $plugin,
+                'sesskey' => $sesskey,
+            ]);
+            $hideshowlink = \html_writer::link($hideshowurl, $icon);
+
+            // Populate table row.
+            $row = new \html_table_row([
+                $pluginname,
+                $hideshowlink,
+            ]);
+            $row->attributes['class'] = $class;
+            $table->data[] = $row;
+        }
+
+        return \html_writer::table($table);
+    }
+}
diff --git a/lib/editor/tiny/plugins/premium/classes/manager.php b/lib/editor/tiny/plugins/premium/classes/manager.php
new file mode 100644
index 0000000000000..03f8b0664f187
--- /dev/null
+++ b/lib/editor/tiny/plugins/premium/classes/manager.php
@@ -0,0 +1,109 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace tiny_premium;
+
+/**
+ * Tiny Premium manager.
+ *
+ * @package    tiny_premium
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class manager {
+
+    /**
+     * Get all Tiny Premium plugins currently supported.
+     *
+     * The plugin identifiers are taken from Tiny Cloud (https://www.tiny.cloud/docs/tinymce/6/plugins/#premium-plugins).
+     *
+     * @return array The array of plugins.
+     */
+    public static function get_plugins(): array {
+        return [
+            'advtable',
+            'typography',
+            'casechange',
+            'checklist',
+            'editimage',
+            'export',
+            'footnotes',
+            'formatpainter',
+            'linkchecker',
+            'pageembed',
+            'permanentpen',
+            'powerpaste',
+            'tinymcespellchecker',
+            'autocorrect',
+            'tableofcontents',
+        ];
+    }
+
+    /**
+     * Get enabled Tiny Premium plugins.
+     *
+     * @return array The array of enabled plugins.
+     */
+    public static function get_enabled_plugins(): array {
+        $plugins = self::get_plugins();
+        $enabledplugins = [];
+        foreach ($plugins as $plugin) {
+            if (self::is_plugin_enabled($plugin)) {
+                $enabledplugins[] = $plugin;
+            }
+        }
+        return $enabledplugins;
+    }
+
+    /**
+     * Check if a Tiny Premium plugin is enabled in config.
+     *
+     * @param string $plugin The plugin to check.
+     * @return bool Return true if enabled.
+     */
+    public static function is_plugin_enabled(string $plugin): bool {
+        $config = get_config('tiny_premium_' . $plugin, 'enabled');
+        return ($config == 1);
+    }
+
+    /**
+     * Set a new value for a Tiny Premium plugin config.
+     *
+     * @param array $data The data to set.
+     * @param string $plugin The plugin to use.
+     */
+    public static function set_plugin_config(array $data, string $plugin): void {
+        // Check this is a valid premium plugin.
+        if (!in_array($plugin, self::get_plugins())) {
+            return;
+        }
+
+        $plugin = 'tiny_premium_' . $plugin;
+
+        foreach ($data as $key => $newvalue) {
+            // Get the old value for the log.
+            $oldvalue = get_config($plugin, $key) ?? null;
+            add_to_config_log($key, $oldvalue, $newvalue, $plugin);
+
+            // If we are disabling the plugin, remove it, otherwise, set the new value.
+            if ($key === 'enabled' && $newvalue == 0) {
+                unset_config($key, $plugin);
+            } else {
+                set_config($key, $newvalue, $plugin);
+            }
+        }
+    }
+}
diff --git a/lib/editor/tiny/plugins/premium/classes/plugininfo.php b/lib/editor/tiny/plugins/premium/classes/plugininfo.php
index 9c7ccdea441cd..17634a81df82c 100644
--- a/lib/editor/tiny/plugins/premium/classes/plugininfo.php
+++ b/lib/editor/tiny/plugins/premium/classes/plugininfo.php
@@ -19,6 +19,8 @@
 use context;
 use editor_tiny\editor;
 use editor_tiny\plugin;
+use editor_tiny\plugin_with_configuration;
+use tiny_premium\manager;
 
 /**
  * Tiny Premium plugin.
@@ -27,7 +29,7 @@
  * @copyright   2023 David Woloszyn <david.woloszyn@moodle.com>
  * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plugininfo extends plugin {
+class plugininfo extends plugin implements plugin_with_configuration {
 
     /**
      * Determine if the plugin should be enabled by checking the capability and if the Tiny Premium API key is set.
@@ -46,4 +48,24 @@ public static function is_enabled(
     ): bool {
         return has_capability('tiny/premium:accesspremium', $context) && (get_config('tiny_premium', 'apikey') != false);
     }
+
+    /**
+     * Get a list of enabled Tiny Premium plugins set by the admin.
+     *
+     * @param context $context The context that the editor is used within
+     * @param array $options The options passed in when requesting the editor
+     * @param array $fpoptions The filepicker options passed in when requesting the editor
+     * @param editor|null $editor The editor instance in which the plugin is initialised
+     * @return array
+     */
+    public static function get_plugin_configuration_for_context(
+        context $context,
+        array $options,
+        array $fpoptions,
+        ?editor $editor = null
+    ): array {
+        return [
+            'premiumplugins' => implode(',', manager::get_enabled_plugins()),
+        ];
+    }
 }
diff --git a/lib/editor/tiny/plugins/premium/db/upgrade.php b/lib/editor/tiny/plugins/premium/db/upgrade.php
new file mode 100644
index 0000000000000..a9f2cc95d0b6b
--- /dev/null
+++ b/lib/editor/tiny/plugins/premium/db/upgrade.php
@@ -0,0 +1,55 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+/**
+ * Upgrade code for tiny_premium.
+ *
+ * @package    tiny_premium
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Function to upgrade tiny_premium.
+ *
+ * @param int $oldversion the version we are upgrading from
+ * @return bool result
+ */
+function xmldb_tiny_premium_upgrade($oldversion) {
+    // Automatically generated Moodle v4.1.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    // Automatically generated Moodle v4.2.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+    if ($oldversion < 2024042400) {
+
+        // Only enable the premium plugins if we have an API key.
+        if (!empty(get_config('tiny_premium', 'apikey'))) {
+            $premiumplugins = \tiny_premium\manager::get_plugins();
+            foreach ($premiumplugins as $plugin) {
+                \tiny_premium\manager::set_plugin_config(['enabled' => 1], $plugin);
+            };
+        }
+
+        upgrade_plugin_savepoint(true, 2024042400, 'tiny', 'premium');
+    }
+
+    return true;
+}
diff --git a/lib/editor/tiny/plugins/premium/lang/en/tiny_premium.php b/lib/editor/tiny/plugins/premium/lang/en/tiny_premium.php
index f9843b70337ee..bddbda2c960f2 100644
--- a/lib/editor/tiny/plugins/premium/lang/en/tiny_premium.php
+++ b/lib/editor/tiny/plugins/premium/lang/en/tiny_premium.php
@@ -25,9 +25,28 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$string['pluginname'] = 'TinyMCE Premium';
 $string['apikey'] = 'API key';
-$string['apikey_desc'] = '<p>Your API key is available on your <a href="https://www.tiny.cloud">Tiny Cloud</a> account page if you have purchased a subscription, or if you are on a free trial.</p><p>See the list of available TinyMCE Premium features for Moodle in the documentation <a href="https://docs.moodle.org/en/TinyMCE_editor">TinyMCE editor</a>.</p>';
+$string['apikey_desc'] = 'Your API key is available on your <a target="_blank" href="https://www.tiny.cloud">Tiny Cloud</a> account page if you have purchased a subscription, or if you are on a free trial.';
+$string['emptyapikeywarning'] = 'Enabled TinyMCE Premium plugins will not be available until an API key is added.';
 $string['helplinktext'] = 'Premium plugins';
+$string['pluginname'] = 'TinyMCE Premium';
+$string['pluginnotfound'] = 'Tiny Premium plugin {$a} not found.';
 $string['premium:accesspremium'] = 'Access TinyMCE Premium features';
-$string['privacy:metadata'] = 'The TinyMCE Premium plugin does not store any personal data.';
+$string['premiumplugin:advtable'] = 'Advanced Table';
+$string['premiumplugin:autocorrect'] = 'Spelling Autocorrect';
+$string['premiumplugin:casechange'] = 'Case Change';
+$string['premiumplugin:checklist'] = 'Checklist';
+$string['premiumplugin:editimage'] = 'Enhanced Image Editing';
+$string['premiumplugin:export'] = 'Export';
+$string['premiumplugin:footnotes'] = 'Footnotes';
+$string['premiumplugin:formatpainter'] = 'Format Painter';
+$string['premiumplugin:linkchecker'] = 'Link Checker';
+$string['premiumplugin:pageembed'] = 'Page Embed';
+$string['premiumplugin:permanentpen'] = 'Permanent Pen';
+$string['premiumplugin:powerpaste'] = 'Powerpaste';
+$string['premiumplugin:tableofcontents'] = 'Table of Contents';
+$string['premiumplugin:tinymcespellchecker'] = 'Spell Checker Pro';
+$string['premiumplugin:typography'] = 'Advanced Typography';
+$string['premiumplugins'] = 'Premium plugins';
+$string['premiumplugins_desc'] = 'Access to TinyMCE Premium plugins requires an API key. Not all listed plugins may be available with your TinyMCE Premium subscription. You can check available plugins on your <a target="_blank" href="https://www.tiny.cloud/my-account/integrate/">Tiny Cloud</a> account page.';
+$string['privacy:metadata'] = 'The Tiny premium plugin for TinyMCE does not store any personal data.';
diff --git a/lib/editor/tiny/plugins/premium/pluginsettings.php b/lib/editor/tiny/plugins/premium/pluginsettings.php
new file mode 100644
index 0000000000000..4111246556f45
--- /dev/null
+++ b/lib/editor/tiny/plugins/premium/pluginsettings.php
@@ -0,0 +1,74 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * TinyMCE Premium plugins configuration page.
+ *
+ * @package    tiny_premium
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(__DIR__ . '/../../../../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+
+$action = required_param('action', PARAM_ALPHANUMEXT);
+$plugin = required_param('plugin', PARAM_ALPHANUMEXT);
+
+$syscontext = context_system::instance();
+$PAGE->set_url('/lib/editor/tiny/plugins/premium/pluginsettings.php');
+$PAGE->set_context($syscontext);
+
+require_admin();
+require_sesskey();
+
+$return = new moodle_url('/admin/settings.php', ['section' => 'tiny_premium_settings']);
+
+// Get all Tiny Premium plugins.
+$premiumplugins = \tiny_premium\manager::get_plugins();
+if (!in_array($plugin, $premiumplugins)) {
+    throw new moodle_exception('pluginnotfound', 'tiny_premium', $return, $plugin);
+}
+
+// Get enabled Tiny Premium plugins.
+$enabledplugins = \tiny_premium\manager::get_enabled_plugins();
+$pluginname = get_string('premiumplugin:' . $plugin, 'tiny_premium');
+
+switch ($action) {
+    case 'disable':
+        if (in_array($plugin, $enabledplugins)) {
+            \tiny_premium\manager::set_plugin_config(['enabled' => 0], $plugin);
+
+            \core\notification::add(
+                get_string('plugin_disabled', 'core_admin', $pluginname),
+                \core\notification::SUCCESS
+            );
+        }
+        break;
+
+    case 'enable':
+        if (!in_array($plugin, $enabledplugins)) {
+            \tiny_premium\manager::set_plugin_config(['enabled' => 1], $plugin);
+
+            \core\notification::add(
+                get_string('plugin_enabled', 'core_admin', $pluginname),
+                \core\notification::SUCCESS
+            );
+        }
+        break;
+}
+
+redirect($return);
diff --git a/lib/editor/tiny/plugins/premium/readme_moodle.txt b/lib/editor/tiny/plugins/premium/readme_moodle.txt
index d0afd906ebb8a..f175412625ebf 100644
--- a/lib/editor/tiny/plugins/premium/readme_moodle.txt
+++ b/lib/editor/tiny/plugins/premium/readme_moodle.txt
@@ -4,9 +4,12 @@ A request to Tiny Cloud is made in the plugin.js file of this plugin.
 This request passes the Tiny Premium API key as part of a URL.
 The URL also contains the major version of Tiny and may need to be updated.
 
-The URL looks like this: https://cdn.tiny.cloud/1/YOUR_API_KEY/tinymce/6/plugins.min.js
-
-Notice that the version (6) is baked into the URL and may need revision.
+The URL looks like this: https://cdn.tiny.cloud/1/YOUR_API_KEY/tinymce/VERSION/plugins.min.js
 
 When upgrading, check Tiny Cloud's documentation regarding the correct API URL
 to use. Go to https://www.tiny.cloud/docs/tinymce
+
+TinyMCE Premium plugins can be individually enabled/disabled by admins.
+Each release of TinyMCE may have a different selection of plugins available.
+When upgrading, please check the list of available TinyMCE Premium plugins and update the list
+with the revisions (lib/editor/tiny/plugins/premium/classes/manager.php).
diff --git a/lib/editor/tiny/plugins/premium/settings.php b/lib/editor/tiny/plugins/premium/settings.php
index 737ed7ceeafb1..128b3debb998f 100644
--- a/lib/editor/tiny/plugins/premium/settings.php
+++ b/lib/editor/tiny/plugins/premium/settings.php
@@ -28,6 +28,7 @@
 if ($hassiteconfig) {
     // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
     if ($ADMIN->fulltree) {
+        // Set API key.
         $setting = new admin_setting_configpasswordunmask(
             'tiny_premium/apikey',
             get_string('apikey', 'tiny_premium'),
@@ -35,5 +36,8 @@
             '',
         );
         $settings->add($setting);
+
+        // Set individual Tiny Premium plugins.
+        $settings->add(new \tiny_premium\local\admin_setting_tiny_premium_plugins());
     }
 }
diff --git a/lib/editor/tiny/plugins/premium/tests/behat/tiny_premium_settings.feature b/lib/editor/tiny/plugins/premium/tests/behat/tiny_premium_settings.feature
new file mode 100644
index 0000000000000..e60ce3aee15f7
--- /dev/null
+++ b/lib/editor/tiny/plugins/premium/tests/behat/tiny_premium_settings.feature
@@ -0,0 +1,23 @@
+@editor @editor_tiny
+Feature: Check the features of the TinyMCE Premium settings
+  In order to use TinyMCE Premium features
+  As an admin
+  I need TinyMCE Premium settings to be configured correctly
+
+  Background:
+    Given I am logged in as "admin"
+    And I navigate to "Plugins > Text editors > TinyMCE editor > TinyMCE Premium" in site administration
+
+  @javascript
+  Scenario: I can see a warning banner when I enable a TinyMCE premium plugin without an API key set
+    When I click on "Enable Advanced Table" "link"
+    Then I should see "Advanced Table enabled."
+    And I should see "Enabled TinyMCE Premium plugins will not be available until an API key is added."
+
+  @javascript
+  Scenario: I cannot see a warning banner when I enable a TinyMCE premium plugin with an API key set
+    Given the following config values are set as admin:
+      | apikey | "123456" | tiny_premium |
+    When I click on "Enable Advanced Table" "link"
+    Then I should see "Advanced Table enabled."
+    And I should not see "Enabled TinyMCE Premium plugins will not be available until an API key is added."
diff --git a/lib/editor/tiny/plugins/premium/tests/manager_test.php b/lib/editor/tiny/plugins/premium/tests/manager_test.php
new file mode 100644
index 0000000000000..bf438e4a1b605
--- /dev/null
+++ b/lib/editor/tiny/plugins/premium/tests/manager_test.php
@@ -0,0 +1,73 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace tiny_premium;
+
+/**
+ * Manager tests class for tiny_premium.
+ *
+ * @package    tiny_premium
+ * @category   test
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+final class manager_test extends \advanced_testcase {
+
+    /**
+     * Test the getting of all available Tiny Premium plugins.
+     *
+     * @covers \tiny_premium\manager
+     */
+    public function test_get_plugins(): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Check all Tiny Premium plugins are returned.
+        $premiumplugins = manager::get_plugins();
+        $this->assertCount(15, $premiumplugins);
+    }
+
+    /**
+     * Test the getting and setting of enabled Tiny Premium plugins.
+     *
+     * @covers \tiny_premium\manager
+     */
+    public function test_get_and_set_enabled_plugins(): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Check all enabled Tiny Premium plugins are returned (all disabled by default).
+        $enabledpremiumplugins = manager::get_enabled_plugins();
+        $this->assertCount(0, $enabledpremiumplugins);
+
+        // Enable a couple premium plugins.
+        manager::set_plugin_config(['enabled' => 1], 'advtable');
+        manager::set_plugin_config(['enabled' => 1], 'formatpainter');
+        // Check the premium plugins are enabled.
+        $enabledpremiumplugins = manager::get_enabled_plugins();
+        $this->assertCount(2, $enabledpremiumplugins);
+        $this->assertTrue(manager::is_plugin_enabled('advtable'));
+        $this->assertTrue(manager::is_plugin_enabled('formatpainter'));
+
+        // Disable a premium plugin.
+        manager::set_plugin_config(['enabled' => 0], 'advtable');
+        // Check the correct premium plugins are enabled.
+        $enabledpremiumplugins = manager::get_enabled_plugins();
+        $this->assertCount(1, $enabledpremiumplugins);
+        $this->assertFalse(manager::is_plugin_enabled('advtable'));
+        $this->assertTrue(manager::is_plugin_enabled('formatpainter'));
+    }
+}
diff --git a/lib/editor/tiny/plugins/premium/version.php b/lib/editor/tiny/plugins/premium/version.php
index e6caa3110eb24..e7341171a242c 100644
--- a/lib/editor/tiny/plugins/premium/version.php
+++ b/lib/editor/tiny/plugins/premium/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2024042200;
+$plugin->version = 2024043000;
 $plugin->requires = 2024041600;
 $plugin->component = 'tiny_premium';

From 810cdb12cbb5c66d9490abd8d3035cd5868792ee Mon Sep 17 00:00:00 2001
From: Huong Nguyen <huongnv13@gmail.com>
Date: Tue, 30 Apr 2024 09:08:02 +0700
Subject: [PATCH 49/75] MDL-81610 course: Update upgrade.txt

---
 course/format/upgrade.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/course/format/upgrade.txt b/course/format/upgrade.txt
index 30b991377ce7d..258890ea7c9c0 100644
--- a/course/format/upgrade.txt
+++ b/course/format/upgrade.txt
@@ -2,6 +2,10 @@ This files describes API changes for course formats
 
 Overview of this plugin type at https://moodledev.io/docs/apis/plugintypes/format
 
+=== 4.5 ===
+* The constructor of core_courseformat\output\local\state\cm has been updated to accept a new optional parameter called is_tracked_user.
+  If is_tracked_user is pre-computed for this CM's course, it can be provided here to avoid an additional function call.
+
 === 4.4 ===
 * The core_courseformat\output\local\content\section::export_for_template() is not returning hiddenfromstudents and notavailable
   directly in the data array anymore. Instead, it returns the visibility data in the 'visibility' key. It means that templates

From f11c6393de8ab2303d548cb6239cd41abc9fdd77 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Tue, 30 Apr 2024 09:22:51 +0100
Subject: [PATCH 50/75] MDL-81724 editor_tiny: remove whitespace from block
 formats syntax.

Ensures that the values are subsequently translated correctly. Workaround
for upstream bug: https://github.com/tinymce/tinymce/pull/9599

Co-authored-by: Andrew Nicols <andrew@nicols.co.uk>
---
 lib/editor/tiny/amd/build/editor.min.js     | 2 +-
 lib/editor/tiny/amd/build/editor.min.js.map | 2 +-
 lib/editor/tiny/amd/src/editor.js           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/editor/tiny/amd/build/editor.min.js b/lib/editor/tiny/amd/build/editor.min.js
index 9f9f76543a688..4cafdce0939a0 100644
--- a/lib/editor/tiny/amd/build/editor.min.js
+++ b/lib/editor/tiny/amd/build/editor.min.js
@@ -1,3 +1,3 @@
-define("editor_tiny/editor",["exports","jquery","core/pending","./defaults","./loader","./options","./utils"],(function(_exports,_jquery,_pending,_defaults,_loader,Options,_utils){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.setupForTarget=_exports.setupForElementId=_exports.getInstanceForElementId=_exports.getInstanceForElement=_exports.getAllInstances=_exports.configureDefaultEditor=void 0,_jquery=_interopRequireDefault(_jquery),_pending=_interopRequireDefault(_pending),Options=function(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}newObj.default=obj,cache&&cache.set(obj,newObj);return newObj}(Options);var _systemImportTransformerGlobalIdentifier="undefined"!=typeof window?window:"undefined"!=typeof self?self:"undefined"!=typeof global?global:{};function _getRequireWildcardCache(nodeInterop){if("function"!=typeof WeakMap)return null;var cacheBabelInterop=new WeakMap,cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}const instanceMap=new Map;let defaultOptions={};const importPluginList=async pluginList=>{const pluginHandlers=await Promise.all(pluginList.map((pluginPath=>-1===pluginPath.indexOf("/")?Promise.resolve(pluginPath):"function"==typeof _systemImportTransformerGlobalIdentifier.define&&_systemImportTransformerGlobalIdentifier.define.amd?new Promise((function(resolve,reject){_systemImportTransformerGlobalIdentifier.require([pluginPath],resolve,reject)})):"undefined"!=typeof module&&module.exports&&"undefined"!=typeof require||"undefined"!=typeof module&&module.component&&_systemImportTransformerGlobalIdentifier.require&&"component"===_systemImportTransformerGlobalIdentifier.require.loader?Promise.resolve(require(pluginPath)):Promise.resolve(_systemImportTransformerGlobalIdentifier[pluginPath])))),pluginNames=pluginHandlers.map((pluginConfig=>"string"==typeof pluginConfig?pluginConfig:Array.isArray(pluginConfig)?pluginConfig[0]:null)).filter((value=>value));return{pluginNames:pluginNames,pluginConfig:pluginHandlers.map((pluginConfig=>Array.isArray(pluginConfig)?pluginConfig[1]:null)).filter((value=>value))}};_exports.getAllInstances=()=>new Map(instanceMap.entries());_exports.getInstanceForElementId=elementId=>getInstanceForElement(document.getElementById(elementId));const getInstanceForElement=element=>{const instance=instanceMap.get(element);if(!instance||!instance.removed)return instance;instanceMap.remove(element)};_exports.getInstanceForElement=getInstanceForElement;_exports.setupForElementId=_ref=>{let{elementId:elementId,options:options}=_ref;const target=document.getElementById(elementId);return setupForTarget(target,options)};(async()=>{const lang=document.querySelector("html").lang,[tinyMCE,langData]=await Promise.all([(0,_loader.getTinyMCE)(),(language=lang,fetch("".concat(M.cfg.wwwroot,"/lib/editor/tiny/lang.php/").concat(M.cfg.langrev,"/").concat(language)).then((response=>response.json())))]);var language;tinyMCE.addI18n(lang,langData)})();const getPlugins=function(){let{plugins:plugins=null}=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return plugins||(defaultOptions.plugins?defaultOptions.plugins:{})},getStandardConfig=(target,tinyMCE,options,plugins)=>{const lang=document.querySelector("html").lang,config=Object.assign({},(0,_defaults.getDefaultConfiguration)(),{base_url:_loader.baseUrl,target:target,min_height:175,height:target.clientHeight||"auto",language:lang,content_css:[options.css],convert_urls:!1,a11y_advanced_options:!0,extended_valid_elements:"script[*],p[*],i[*]",xss_sanitization:!1,quickbars_insert_toolbar:"",block_formats:"Paragraph=p; Heading 3=h3; Heading 4=h4; Heading 5=h5; Heading 6=h6; Preformatted=pre",plugins:[...plugins],skin:"oxide",help_accessibility:!1,promotion:!1,branding:options.branding,table_header_type:"sectionCells",entity_encoding:"raw",ui_mode:"split",browser_spellcheck:!0,setup:editor=>{Options.register(editor,options),editor.on("PreInit",(function(){this.contentWindow=this.iframeElement.contentWindow})),editor.on("init",(function(){(0,_utils.removeSubmenuItem)(editor,"align","tiny:justify"),((editor,target)=>{let expectedEditingAreaHeight=0;expectedEditingAreaHeight=target.clientHeight?target.clientHeight:target.rows*(parseFloat(window.getComputedStyle(target).lineHeight)||22),editor.getContainer().querySelector(".tox-sidebar-wrap").clientHeight<expectedEditingAreaHeight&&(editor.getContainer().querySelector(".tox-sidebar-wrap").style.height="".concat(expectedEditingAreaHeight,"px"))})(editor,target)})),target.addEventListener("form:editorUpdated",(function(){(0,_utils.updateEditorState)(editor,target)})),target.dispatchEvent(new Event("form:editorUpdated"))}});return config.toolbar=(0,_utils.addToolbarSection)(config.toolbar,"content","formatting",!0),config.toolbar=(0,_utils.addToolbarButton)(config.toolbar,"content","link"),config.toolbar=(0,_utils.addToolbarSection)(config.toolbar,"directionality","alignment",!0),config.toolbar=(0,_utils.addToolbarButtons)(config.toolbar,"directionality",["ltr","rtl"]),config.toolbar=(0,_utils.removeToolbarButton)(config.toolbar,"alignment","alignjustify"),config},getEditorConfiguration=(target,tinyMCE,options,pluginValues)=>{const{pluginNames:pluginNames,pluginConfig:pluginConfig}=pluginValues,instanceConfig=getStandardConfig(target,0,options,pluginNames);return instanceConfig.menu.file&&(instanceConfig.menu.file.items=""),instanceConfig.menu.format&&(instanceConfig.menu.format.items=instanceConfig.menu.format.items.replace(/forecolor ?/,"").replace(/backcolor ?/,"").replace(/fontfamily ?/,"").replace(/fontsize ?/,"").replace(/styles ?/,"").replaceAll(/\| *\|/g,"|")),instanceConfig.quickbars_selection_toolbar=instanceConfig.quickbars_selection_toolbar.replace("h2 h3","h3 h4 h5 h6"),pluginConfig.filter((pluginConfig=>"function"==typeof pluginConfig.configure)).forEach((pluginConfig=>{const pluginInstanceOverride=pluginConfig.configure(instanceConfig,options);Object.assign(instanceConfig,pluginInstanceOverride)})),Object.assign(instanceConfig,Options.getInitialPluginConfiguration(options)),instanceConfig},isModalMode=target=>!!target.closest('[data-region="modal"]'),setupForTarget=async function(target){let options=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const instance=getInstanceForElement(target);if(instance)return Promise.resolve(instance);const pendingPromise=new _pending.default("editor_tiny/editor:setupForTarget"),plugins=getPlugins(options),[tinyMCE,pluginValues]=await Promise.all([(0,_loader.getTinyMCE)(),importPluginList(Object.keys(plugins))]);tinyMCE.get().filter((editor=>!editor.getElement().isConnected)).forEach((editor=>{editor.remove()}));const existingEditor=tinyMCE.EditorManager.get(target.id);if(existingEditor){if(existingEditor.getElement()===target)return pendingPromise.resolve(),Promise.resolve(existingEditor);throw pendingPromise.resolve(),new Error("TinyMCE instance already exists for different target with same ID")}const instanceConfig=getEditorConfiguration(target,0,options,pluginValues),[editor]=await tinyMCE.init(instanceConfig);return target.dataset.fieldtype="editor",instanceMap.set(target,editor),editor.on("remove",(_ref2=>{let{target:target}=_ref2;instanceMap.delete(target.targetElm),target.targetElm.dataset.fieldtype=null})),target.form&&(0,_jquery.default)(target.form).on("submit",(()=>{editor.save()})),editor.on("blur",(()=>{editor.save()})),editor.on("OpenWindow",(()=>{const modals=document.querySelectorAll('[data-region="modal"]');modals&&modals.forEach((modal=>{modal.classList.contains("hide")||modal.classList.add("hide")}))})),editor.on("CloseWindow",(()=>{if(isModalMode(target)){const modals=document.querySelectorAll('[data-region="modal"]');modals&&modals.forEach((modal=>{modal.classList.contains("hide")&&modal.classList.remove("hide")}))}})),pendingPromise.resolve(),editor};_exports.setupForTarget=setupForTarget;_exports.configureDefaultEditor=function(){let options=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};defaultOptions=options}}));
+define("editor_tiny/editor",["exports","jquery","core/pending","./defaults","./loader","./options","./utils"],(function(_exports,_jquery,_pending,_defaults,_loader,Options,_utils){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.setupForTarget=_exports.setupForElementId=_exports.getInstanceForElementId=_exports.getInstanceForElement=_exports.getAllInstances=_exports.configureDefaultEditor=void 0,_jquery=_interopRequireDefault(_jquery),_pending=_interopRequireDefault(_pending),Options=function(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}newObj.default=obj,cache&&cache.set(obj,newObj);return newObj}(Options);var _systemImportTransformerGlobalIdentifier="undefined"!=typeof window?window:"undefined"!=typeof self?self:"undefined"!=typeof global?global:{};function _getRequireWildcardCache(nodeInterop){if("function"!=typeof WeakMap)return null;var cacheBabelInterop=new WeakMap,cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}const instanceMap=new Map;let defaultOptions={};const importPluginList=async pluginList=>{const pluginHandlers=await Promise.all(pluginList.map((pluginPath=>-1===pluginPath.indexOf("/")?Promise.resolve(pluginPath):"function"==typeof _systemImportTransformerGlobalIdentifier.define&&_systemImportTransformerGlobalIdentifier.define.amd?new Promise((function(resolve,reject){_systemImportTransformerGlobalIdentifier.require([pluginPath],resolve,reject)})):"undefined"!=typeof module&&module.exports&&"undefined"!=typeof require||"undefined"!=typeof module&&module.component&&_systemImportTransformerGlobalIdentifier.require&&"component"===_systemImportTransformerGlobalIdentifier.require.loader?Promise.resolve(require(pluginPath)):Promise.resolve(_systemImportTransformerGlobalIdentifier[pluginPath])))),pluginNames=pluginHandlers.map((pluginConfig=>"string"==typeof pluginConfig?pluginConfig:Array.isArray(pluginConfig)?pluginConfig[0]:null)).filter((value=>value));return{pluginNames:pluginNames,pluginConfig:pluginHandlers.map((pluginConfig=>Array.isArray(pluginConfig)?pluginConfig[1]:null)).filter((value=>value))}};_exports.getAllInstances=()=>new Map(instanceMap.entries());_exports.getInstanceForElementId=elementId=>getInstanceForElement(document.getElementById(elementId));const getInstanceForElement=element=>{const instance=instanceMap.get(element);if(!instance||!instance.removed)return instance;instanceMap.remove(element)};_exports.getInstanceForElement=getInstanceForElement;_exports.setupForElementId=_ref=>{let{elementId:elementId,options:options}=_ref;const target=document.getElementById(elementId);return setupForTarget(target,options)};(async()=>{const lang=document.querySelector("html").lang,[tinyMCE,langData]=await Promise.all([(0,_loader.getTinyMCE)(),(language=lang,fetch("".concat(M.cfg.wwwroot,"/lib/editor/tiny/lang.php/").concat(M.cfg.langrev,"/").concat(language)).then((response=>response.json())))]);var language;tinyMCE.addI18n(lang,langData)})();const getPlugins=function(){let{plugins:plugins=null}=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return plugins||(defaultOptions.plugins?defaultOptions.plugins:{})},getStandardConfig=(target,tinyMCE,options,plugins)=>{const lang=document.querySelector("html").lang,config=Object.assign({},(0,_defaults.getDefaultConfiguration)(),{base_url:_loader.baseUrl,target:target,min_height:175,height:target.clientHeight||"auto",language:lang,content_css:[options.css],convert_urls:!1,a11y_advanced_options:!0,extended_valid_elements:"script[*],p[*],i[*]",xss_sanitization:!1,quickbars_insert_toolbar:"",block_formats:"Paragraph=p;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre",plugins:[...plugins],skin:"oxide",help_accessibility:!1,promotion:!1,branding:options.branding,table_header_type:"sectionCells",entity_encoding:"raw",ui_mode:"split",browser_spellcheck:!0,setup:editor=>{Options.register(editor,options),editor.on("PreInit",(function(){this.contentWindow=this.iframeElement.contentWindow})),editor.on("init",(function(){(0,_utils.removeSubmenuItem)(editor,"align","tiny:justify"),((editor,target)=>{let expectedEditingAreaHeight=0;expectedEditingAreaHeight=target.clientHeight?target.clientHeight:target.rows*(parseFloat(window.getComputedStyle(target).lineHeight)||22),editor.getContainer().querySelector(".tox-sidebar-wrap").clientHeight<expectedEditingAreaHeight&&(editor.getContainer().querySelector(".tox-sidebar-wrap").style.height="".concat(expectedEditingAreaHeight,"px"))})(editor,target)})),target.addEventListener("form:editorUpdated",(function(){(0,_utils.updateEditorState)(editor,target)})),target.dispatchEvent(new Event("form:editorUpdated"))}});return config.toolbar=(0,_utils.addToolbarSection)(config.toolbar,"content","formatting",!0),config.toolbar=(0,_utils.addToolbarButton)(config.toolbar,"content","link"),config.toolbar=(0,_utils.addToolbarSection)(config.toolbar,"directionality","alignment",!0),config.toolbar=(0,_utils.addToolbarButtons)(config.toolbar,"directionality",["ltr","rtl"]),config.toolbar=(0,_utils.removeToolbarButton)(config.toolbar,"alignment","alignjustify"),config},getEditorConfiguration=(target,tinyMCE,options,pluginValues)=>{const{pluginNames:pluginNames,pluginConfig:pluginConfig}=pluginValues,instanceConfig=getStandardConfig(target,0,options,pluginNames);return instanceConfig.menu.file&&(instanceConfig.menu.file.items=""),instanceConfig.menu.format&&(instanceConfig.menu.format.items=instanceConfig.menu.format.items.replace(/forecolor ?/,"").replace(/backcolor ?/,"").replace(/fontfamily ?/,"").replace(/fontsize ?/,"").replace(/styles ?/,"").replaceAll(/\| *\|/g,"|")),instanceConfig.quickbars_selection_toolbar=instanceConfig.quickbars_selection_toolbar.replace("h2 h3","h3 h4 h5 h6"),pluginConfig.filter((pluginConfig=>"function"==typeof pluginConfig.configure)).forEach((pluginConfig=>{const pluginInstanceOverride=pluginConfig.configure(instanceConfig,options);Object.assign(instanceConfig,pluginInstanceOverride)})),Object.assign(instanceConfig,Options.getInitialPluginConfiguration(options)),instanceConfig},isModalMode=target=>!!target.closest('[data-region="modal"]'),setupForTarget=async function(target){let options=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};const instance=getInstanceForElement(target);if(instance)return Promise.resolve(instance);const pendingPromise=new _pending.default("editor_tiny/editor:setupForTarget"),plugins=getPlugins(options),[tinyMCE,pluginValues]=await Promise.all([(0,_loader.getTinyMCE)(),importPluginList(Object.keys(plugins))]);tinyMCE.get().filter((editor=>!editor.getElement().isConnected)).forEach((editor=>{editor.remove()}));const existingEditor=tinyMCE.EditorManager.get(target.id);if(existingEditor){if(existingEditor.getElement()===target)return pendingPromise.resolve(),Promise.resolve(existingEditor);throw pendingPromise.resolve(),new Error("TinyMCE instance already exists for different target with same ID")}const instanceConfig=getEditorConfiguration(target,0,options,pluginValues),[editor]=await tinyMCE.init(instanceConfig);return target.dataset.fieldtype="editor",instanceMap.set(target,editor),editor.on("remove",(_ref2=>{let{target:target}=_ref2;instanceMap.delete(target.targetElm),target.targetElm.dataset.fieldtype=null})),target.form&&(0,_jquery.default)(target.form).on("submit",(()=>{editor.save()})),editor.on("blur",(()=>{editor.save()})),editor.on("OpenWindow",(()=>{const modals=document.querySelectorAll('[data-region="modal"]');modals&&modals.forEach((modal=>{modal.classList.contains("hide")||modal.classList.add("hide")}))})),editor.on("CloseWindow",(()=>{if(isModalMode(target)){const modals=document.querySelectorAll('[data-region="modal"]');modals&&modals.forEach((modal=>{modal.classList.contains("hide")&&modal.classList.remove("hide")}))}})),pendingPromise.resolve(),editor};_exports.setupForTarget=setupForTarget;_exports.configureDefaultEditor=function(){let options=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};defaultOptions=options}}));
 
 //# sourceMappingURL=editor.min.js.map
\ No newline at end of file
diff --git a/lib/editor/tiny/amd/build/editor.min.js.map b/lib/editor/tiny/amd/build/editor.min.js.map
index 09739266c2d58..df9f6837aa1c7 100644
--- a/lib/editor/tiny/amd/build/editor.min.js.map
+++ b/lib/editor/tiny/amd/build/editor.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"editor.min.js","sources":["../src/editor.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * TinyMCE Editor Manager.\n *\n * @module editor_tiny/editor\n * @copyright  2022 Andrew Lyons <andrew@nicols.co.uk>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport jQuery from 'jquery';\nimport Pending from 'core/pending';\nimport {getDefaultConfiguration} from './defaults';\nimport {getTinyMCE, baseUrl} from './loader';\nimport * as Options from './options';\nimport {addToolbarButton, addToolbarButtons, addToolbarSection,\n    removeToolbarButton, removeSubmenuItem, updateEditorState} from './utils';\n\n/**\n * Storage for the TinyMCE instances on the page.\n * @type {Map}\n */\nconst instanceMap = new Map();\n\n/**\n * The default editor configuration.\n * @type {Object}\n */\nlet defaultOptions = {};\n\n/**\n * Require the modules for the named set of TinyMCE plugins.\n *\n * @param {string[]} pluginList The list of plugins\n * @return {Promise[]} A matching set of Promises relating to the requested plugins\n */\nconst importPluginList = async(pluginList) => {\n    // Fetch all of the plugins from the list of plugins.\n    // If a plugin contains a '/' then it is assumed to be a Moodle AMD module to import.\n    const pluginHandlers = await Promise.all(pluginList.map(pluginPath => {\n        if (pluginPath.indexOf('/') === -1) {\n            // A standard TinyMCE Plugin.\n            return Promise.resolve(pluginPath);\n        }\n\n        return import(pluginPath);\n    }));\n\n    // Normalise the plugin data to a list of plugin names.\n    // Two formats are supported:\n    // - a string; and\n    // - an array whose first element is the plugin name, and the second element is the plugin configuration.\n    const pluginNames = pluginHandlers.map((pluginConfig) => {\n        if (typeof pluginConfig === 'string') {\n            return pluginConfig;\n        }\n        if (Array.isArray(pluginConfig)) {\n            return pluginConfig[0];\n        }\n        return null;\n    }).filter((value) => value);\n\n    // Fetch the list of pluginConfig handlers.\n    const pluginConfig = pluginHandlers.map((pluginConfig) => {\n        if (Array.isArray(pluginConfig)) {\n            return pluginConfig[1];\n        }\n        return null;\n    }).filter((value) => value);\n\n    return {\n        pluginNames,\n        pluginConfig,\n    };\n};\n\n/**\n * Fetch the language data for the specified language.\n *\n * @param {string} language The language identifier\n * @returns {object}\n */\nconst fetchLanguage = (language) => fetch(\n    `${M.cfg.wwwroot}/lib/editor/tiny/lang.php/${M.cfg.langrev}/${language}`\n).then(response => response.json());\n\n/**\n * Get a list of all Editors in a Map, keyed by the DOM Node that the Editor is associated with.\n *\n * @returns {Map<Node, Editor>}\n */\nexport const getAllInstances = () => new Map(instanceMap.entries());\n\n/**\n * Get the TinyMCE instance for the specified Node ID.\n *\n * @param {string} elementId\n * @returns {TinyMCE|undefined}\n */\nexport const getInstanceForElementId = elementId => getInstanceForElement(document.getElementById(elementId));\n\n/*\n * Get the TinyMCE instance for the specified HTMLElement.\n *\n * @param {HTMLElement} element\n * @returns {TinyMCE|undefined}\n */\nexport const getInstanceForElement = element => {\n    const instance = instanceMap.get(element);\n    if (instance && instance.removed) {\n        instanceMap.remove(element);\n        return undefined;\n    }\n    return instance;\n};\n\n/**\n * Set up TinyMCE for the selector at the specified HTML Node id.\n *\n * @param {object} config The configuration required to setup the editor\n * @param {string} config.elementId The HTML Node ID\n * @param {Object} config.options The editor plugin configuration\n * @return {Promise<TinyMCE>} The TinyMCE instance\n */\nexport const setupForElementId = ({elementId, options}) => {\n    const target = document.getElementById(elementId);\n    return setupForTarget(target, options);\n};\n\n/**\n * Initialise the page with standard TinyMCE requirements.\n *\n * Currently this includes the language taken from the HTML lang property.\n */\nconst initialisePage = async() => {\n    const lang = document.querySelector('html').lang;\n\n    const [tinyMCE, langData] = await Promise.all([getTinyMCE(), fetchLanguage(lang)]);\n    tinyMCE.addI18n(lang, langData);\n};\ninitialisePage();\n\n/**\n * Get the list of plugins to load for the specified configuration.\n *\n * If the specified configuration does not include a plugin configuration, then return the default configuration.\n *\n * @param {object} options\n * @param {array} [options.plugins=null] The plugin list\n * @returns {object}\n */\nconst getPlugins = ({plugins = null} = {}) => {\n    if (plugins) {\n        return plugins;\n    }\n\n    if (defaultOptions.plugins) {\n        return defaultOptions.plugins;\n    }\n\n    return {};\n};\n\n/**\n * Adjust the editor size base on the target element.\n *\n * @param {TinyMCE} editor TinyMCE editor\n * @param {Node} target Target element\n */\nconst adjustEditorSize = (editor, target) => {\n    let expectedEditingAreaHeight = 0;\n    if (target.clientHeight) {\n        expectedEditingAreaHeight = target.clientHeight;\n    } else {\n        // If the target element is hidden, we cannot get the lineHeight of the target element.\n        // We don't have a proper way to retrieve the general lineHeight of the theme, so we use 22 here, it's equivalent to 1.5em.\n        expectedEditingAreaHeight = target.rows * (parseFloat(window.getComputedStyle(target).lineHeight) || 22);\n    }\n    const currentEditingAreaHeight = editor.getContainer().querySelector('.tox-sidebar-wrap').clientHeight;\n    if (currentEditingAreaHeight < expectedEditingAreaHeight) {\n        // Change the height based on the target element's height.\n        editor.getContainer().querySelector('.tox-sidebar-wrap').style.height = `${expectedEditingAreaHeight}px`;\n    }\n};\n\n/**\n * Get the standard configuration for the specified options.\n *\n * @param {Node} target\n * @param {tinyMCE} tinyMCE\n * @param {object} options\n * @param {Array} plugins\n * @returns {object}\n */\nconst getStandardConfig = (target, tinyMCE, options, plugins) => {\n    const lang = document.querySelector('html').lang;\n\n    const config = Object.assign({}, getDefaultConfiguration(), {\n        // eslint-disable-next-line camelcase\n        base_url: baseUrl,\n\n        // Set the editor target.\n        // https://www.tiny.cloud/docs/tinymce/6/editor-important-options/#target\n        target,\n\n        // https://www.tiny.cloud/docs/tinymce/6/customize-ui/#set-maximum-and-minimum-heights-and-widths\n        // Set the minimum height to the smallest height that we can fit the Menu bar, Tool bar, Status bar and the text area.\n        // eslint-disable-next-line camelcase\n        min_height: 175,\n\n        // Base the height on the size of the text area.\n        // In some cases, E.g.: The target is an advanced element, it will be hidden. We cannot get the height at this time.\n        // So set the height to auto, and adjust it later by adjustEditorSize().\n        height: target.clientHeight || 'auto',\n\n        // Set the language.\n        // https://www.tiny.cloud/docs/tinymce/6/ui-localization/#language\n        // eslint-disable-next-line camelcase\n        language: lang,\n\n        // Load the editor stylesheet into the editor iframe.\n        // https://www.tiny.cloud/docs/tinymce/6/add-css-options/\n        // eslint-disable-next-line camelcase\n        content_css: [\n            options.css,\n        ],\n\n        // Do not convert URLs to relative URLs.\n        // https://www.tiny.cloud/docs/tinymce/6/url-handling/#convert_urls\n        // eslint-disable-next-line camelcase\n        convert_urls: false,\n\n        // Enabled 'advanced' a11y options.\n        // This includes allowing role=\"presentation\" from the image uploader.\n        // https://www.tiny.cloud/docs/tinymce/6/accessibility/\n        // eslint-disable-next-line camelcase\n        a11y_advanced_options: true,\n\n        // Add specific rules to the valid elements.\n        // eslint-disable-next-line camelcase\n        extended_valid_elements: 'script[*],p[*],i[*]',\n\n        // Disable XSS Sanitisation.\n        // We do this in PHP.\n        // https://www.tiny.cloud/docs/tinymce/6/security/#turning-dompurify-off\n        // Note: This feature has been backported from TinyMCE 6.4.0.\n        // eslint-disable-next-line camelcase\n        xss_sanitization: false,\n\n        // Disable quickbars entirely.\n        // The UI is not ideal and we'll wait for it to improve in future before we enable it in Moodle.\n        // eslint-disable-next-line camelcase\n        quickbars_insert_toolbar: '',\n\n        // Override the standard block formats property (removing h1 & h2).\n        // https://www.tiny.cloud/docs/tinymce/6/user-formatting-options/#block_formats\n        // eslint-disable-next-line camelcase\n        block_formats: 'Paragraph=p; Heading 3=h3; Heading 4=h4; Heading 5=h5; Heading 6=h6; Preformatted=pre',\n\n        // The list of plugins to include in the instance.\n        // https://www.tiny.cloud/docs/tinymce/6/editor-important-options/#plugins\n        plugins: [\n            ...plugins,\n        ],\n\n        // Skins\n        skin: 'oxide',\n\n        // Do not show the help link in the status bar.\n        // https://www.tiny.cloud/docs/tinymce/latest/accessibility/#help_accessibility\n        // eslint-disable-next-line camelcase\n        help_accessibility: false,\n\n        // Remove the \"Upgrade\" link for Tiny.\n        // https://www.tiny.cloud/docs/tinymce/6/editor-premium-upgrade-promotion/\n        promotion: false,\n\n        // Allow the administrator to disable branding.\n        // https://www.tiny.cloud/docs/tinymce/6/statusbar-configuration-options/#branding\n        branding: options.branding,\n\n        // Put th cells in a thead element.\n        // https://www.tiny.cloud/docs/tinymce/6/table-options/#table_header_type\n        // eslint-disable-next-line camelcase\n        table_header_type: 'sectionCells',\n\n        // Stored text in non-entity form.\n        // https://www.tiny.cloud/docs/tinymce/6/content-filtering/#entity_encoding\n        // eslint-disable-next-line camelcase\n        entity_encoding: \"raw\",\n\n        // Enable support for editors in scrollable containers.\n        // https://www.tiny.cloud/docs/tinymce/6/ui-mode-configuration-options/#ui_mode\n        // eslint-disable-next-line camelcase\n        ui_mode: 'split',\n\n        // Enable browser-supported spell checking.\n        // https://www.tiny.cloud/docs/tinymce/latest/spelling/\n        // eslint-disable-next-line camelcase\n        browser_spellcheck: true,\n\n        setup: (editor) => {\n            Options.register(editor, options);\n\n            editor.on('PreInit', function() {\n                // Work around a bug in TinyMCE with Firefox.\n                // When an editor is removed, and replaced with an identically attributed editor (same ID),\n                // and the Firefox window is freshly opened (e.g. Behat, Private browsing), the wrong contentWindow\n                // is assigned to the editor instance leading to an NS_ERROR_UNEXPECTED error in Firefox.\n                // This is a workaround for that issue.\n                this.contentWindow = this.iframeElement.contentWindow;\n            });\n            editor.on('init', function() {\n                // Hide justify alignment sub-menu.\n                removeSubmenuItem(editor, 'align', 'tiny:justify');\n                // Adjust the editor size.\n                adjustEditorSize(editor, target);\n            });\n\n            target.addEventListener('form:editorUpdated', function() {\n                updateEditorState(editor, target);\n            });\n\n            target.dispatchEvent(new Event('form:editorUpdated'));\n        },\n    });\n\n    config.toolbar = addToolbarSection(config.toolbar, 'content', 'formatting', true);\n    config.toolbar = addToolbarButton(config.toolbar, 'content', 'link');\n\n    // Add directionality plugins, always.\n    config.toolbar = addToolbarSection(config.toolbar, 'directionality', 'alignment', true);\n    config.toolbar = addToolbarButtons(config.toolbar, 'directionality', ['ltr', 'rtl']);\n\n    // Remove the align justify button from the toolbar.\n    config.toolbar = removeToolbarButton(config.toolbar, 'alignment', 'alignjustify');\n\n    return config;\n};\n\n/**\n * Fetch the TinyMCE configuration for this editor instance.\n *\n * @param {HTMLElement} target\n * @param {TinyMCE} tinyMCE The TinyMCE API\n * @param {Object} options The editor plugin configuration\n * @param {object} pluginValues\n * @param {object} pluginValues.pluginConfig The list of plugin configuration\n * @param {object} pluginValues.pluginNames The list of plugins to load\n * @returns {object} The TinyMCE Configuration\n */\nconst getEditorConfiguration = (target, tinyMCE, options, pluginValues) => {\n    const {\n        pluginNames,\n        pluginConfig,\n    } = pluginValues;\n\n    // Allow plugins to modify the configuration.\n    // This seems a little strange, but we must double-process the config slightly.\n\n    // First we fetch the standard configuration.\n    const instanceConfig = getStandardConfig(target, tinyMCE, options, pluginNames);\n\n    // Next we make any standard changes.\n    // Here we remove the file menu, as it doesn't offer any useful functionality.\n    // We only empty the items list so that a plugin may choose to add to it themselves later if they wish.\n    if (instanceConfig.menu.file) {\n        instanceConfig.menu.file.items = '';\n    }\n\n    // We disable the styles, backcolor, and forecolor plugins from the format menu.\n    // These are not useful for Moodle and we don't want to encourage their use.\n    if (instanceConfig.menu.format) {\n        instanceConfig.menu.format.items = instanceConfig.menu.format.items\n            // Remove forecolor and backcolor.\n            .replace(/forecolor ?/, '')\n            .replace(/backcolor ?/, '')\n\n            // Remove fontfamily for now.\n            .replace(/fontfamily ?/, '')\n\n            // Remove fontsize for now.\n            .replace(/fontsize ?/, '')\n\n            // Remove styles - it just duplicates the format menu in a way which does not respect configuration\n            .replace(/styles ?/, '')\n\n            // Remove any duplicate separators.\n            .replaceAll(/\\| *\\|/g, '|');\n    }\n\n    // eslint-disable-next-line camelcase\n    instanceConfig.quickbars_selection_toolbar = instanceConfig.quickbars_selection_toolbar.replace('h2 h3', 'h3 h4 h5 h6');\n\n    // Next we call the `configure` function for any plugin which defines it.\n    // We pass the current instanceConfig in here, to allow them to make certain changes to the global configuration.\n    // For example, to add themselves to any menu, toolbar, and so on.\n    // Any plugin which wishes to have configuration options must register those options here.\n    pluginConfig.filter((pluginConfig) => typeof pluginConfig.configure === 'function').forEach((pluginConfig) => {\n        const pluginInstanceOverride = pluginConfig.configure(instanceConfig, options);\n        Object.assign(instanceConfig, pluginInstanceOverride);\n    });\n\n    // Next we convert the plugin configuration into a format that TinyMCE understands.\n    Object.assign(instanceConfig, Options.getInitialPluginConfiguration(options));\n\n    return instanceConfig;\n};\n\n/**\n * Check if the target for TinyMCE is in a modal or not.\n *\n * @param {HTMLElement} target Target to check\n * @returns {boolean} True if the target is in a modal form.\n */\nconst isModalMode = (target) => {\n    return !!target.closest('[data-region=\"modal\"]');\n};\n\n/**\n * Set up TinyMCE for the HTML Element.\n *\n * @param {HTMLElement} target\n * @param {Object} [options={}] The editor plugin configuration\n * @return {Promise<TinyMCE>} The TinyMCE instance\n */\nexport const setupForTarget = async(target, options = {}) => {\n    const instance = getInstanceForElement(target);\n    if (instance) {\n        return Promise.resolve(instance);\n    }\n\n    // Register a new pending promise to ensure that Behat waits for the editor setup to complete before continuing.\n    const pendingPromise = new Pending('editor_tiny/editor:setupForTarget');\n\n    // Get the list of plugins.\n    const plugins = getPlugins(options);\n\n    // Fetch the tinyMCE API, and instantiate the plugins.\n    const [tinyMCE, pluginValues] = await Promise.all([\n        getTinyMCE(),\n        importPluginList(Object.keys(plugins)),\n    ]);\n\n    // TinyMCE uses the element ID as a map key internally, even if the target has changed.\n    // In the case where we have an editor in a modal form which has been detached from the DOM, but the editor not removed,\n    // we need to manually destroy the editor.\n    // We could theoretically do this with a Mutation Observer, but in some cases the Node may be moved,\n    // or added back elsewhere in the DOM.\n\n    // First remove any detached editors.\n    tinyMCE.get().filter((editor) => !editor.getElement().isConnected).forEach((editor) => {\n        editor.remove();\n    });\n\n    // Now check for any existing editor which shares the same ID.\n    const existingEditor = tinyMCE.EditorManager.get(target.id);\n    if (existingEditor) {\n        if (existingEditor.getElement() === target) {\n            pendingPromise.resolve();\n            return Promise.resolve(existingEditor);\n        } else {\n            pendingPromise.resolve();\n            throw new Error('TinyMCE instance already exists for different target with same ID');\n        }\n    }\n\n    // Get the editor configuration for this editor.\n    const instanceConfig = getEditorConfiguration(target, tinyMCE, options, pluginValues);\n\n    // Initialise the editor instance for the given configuration.\n    // At this point any plugin which has configuration options registered will have them applied for this instance.\n    const [editor] = await tinyMCE.init(instanceConfig);\n\n    // Update the textarea when the editor to set the field type for Behat.\n    target.dataset.fieldtype = 'editor';\n\n    // Store the editor instance in the instanceMap and register a listener on removal to remove it from the map.\n    instanceMap.set(target, editor);\n    editor.on('remove', ({target}) => {\n        // Handle removal of the editor from the map on destruction.\n        instanceMap.delete(target.targetElm);\n        target.targetElm.dataset.fieldtype = null;\n    });\n\n    // If the editor is part of a form, also listen to the jQuery submit event.\n    // The jQuery submit event will not trigger the native submit event, and therefore the content will not be saved.\n    // We cannot rely on listening to the bubbled submit event on the document because other events on child nodes may\n    // consume the data before it is saved.\n    if (target.form) {\n        jQuery(target.form).on('submit', () => {\n            editor.save();\n        });\n    }\n\n    // Save the editor content to the textarea when the editor is blurred.\n    editor.on('blur', () => {\n        editor.save();\n    });\n\n    // If the editor is in a modal, we need to hide the modal when window editor's window is opened.\n    editor.on('OpenWindow', () => {\n        const modals = document.querySelectorAll('[data-region=\"modal\"]');\n        if (modals) {\n            modals.forEach((modal) => {\n                if (!modal.classList.contains('hide')) {\n                    modal.classList.add('hide');\n                }\n            });\n        }\n    });\n\n    // If the editor's window is closed, we need to show the hidden modal back.\n    editor.on('CloseWindow', () => {\n        if (isModalMode(target)) {\n            const modals = document.querySelectorAll('[data-region=\"modal\"]');\n            if (modals) {\n                modals.forEach((modal) => {\n                    if (modal.classList.contains('hide')) {\n                        modal.classList.remove('hide');\n                    }\n                });\n            }\n        }\n    });\n\n    pendingPromise.resolve();\n    return editor;\n};\n\n/**\n * Set the default editor configuration.\n *\n * This configuration is used when an editor is initialised without any configuration.\n *\n * @param {object} [options={}]\n */\nexport const configureDefaultEditor = (options = {}) => {\n    defaultOptions = options;\n};\n"],"names":["instanceMap","Map","defaultOptions","importPluginList","async","pluginHandlers","Promise","all","pluginList","map","pluginPath","indexOf","resolve","pluginNames","pluginConfig","Array","isArray","filter","value","entries","elementId","getInstanceForElement","document","getElementById","element","instance","get","removed","remove","_ref","options","target","setupForTarget","lang","querySelector","tinyMCE","langData","language","fetch","M","cfg","wwwroot","langrev","then","response","json","addI18n","initialisePage","getPlugins","plugins","getStandardConfig","config","Object","assign","base_url","baseUrl","min_height","height","clientHeight","content_css","css","convert_urls","a11y_advanced_options","extended_valid_elements","xss_sanitization","quickbars_insert_toolbar","block_formats","skin","help_accessibility","promotion","branding","table_header_type","entity_encoding","ui_mode","browser_spellcheck","setup","editor","Options","register","on","contentWindow","this","iframeElement","expectedEditingAreaHeight","rows","parseFloat","window","getComputedStyle","lineHeight","getContainer","style","adjustEditorSize","addEventListener","dispatchEvent","Event","toolbar","getEditorConfiguration","pluginValues","instanceConfig","menu","file","items","format","replace","replaceAll","quickbars_selection_toolbar","configure","forEach","pluginInstanceOverride","getInitialPluginConfiguration","isModalMode","closest","pendingPromise","Pending","keys","getElement","isConnected","existingEditor","EditorManager","id","Error","init","dataset","fieldtype","set","_ref2","delete","targetElm","form","save","modals","querySelectorAll","modal","classList","contains","add"],"mappings":"4oDAmCMA,YAAc,IAAIC,QAMpBC,eAAiB,SAQfC,iBAAmBC,MAAAA,mBAGfC,qBAAuBC,QAAQC,IAAIC,WAAWC,KAAIC,aACnB,IAA7BA,WAAWC,QAAQ,KAEZL,QAAQM,QAAQF,4NAGbA,4WAAAA,gBAOZG,YAAcR,eAAeI,KAAKK,cACR,iBAAjBA,aACAA,aAEPC,MAAMC,QAAQF,cACPA,aAAa,GAEjB,OACRG,QAAQC,OAAUA,cAUd,CACHL,YAAAA,YACAC,aATiBT,eAAeI,KAAKK,cACjCC,MAAMC,QAAQF,cACPA,aAAa,GAEjB,OACRG,QAAQC,OAAUA,mCAuBM,IAAM,IAAIjB,IAAID,YAAYmB,4CAQlBC,WAAaC,sBAAsBC,SAASC,eAAeH,kBAQrFC,sBAAwBG,gBAC3BC,SAAWzB,YAAY0B,IAAIF,aAC7BC,WAAYA,SAASE,eAIlBF,SAHHzB,YAAY4B,OAAOJ,0FAcMK,WAACT,UAACA,UAADU,QAAYA,oBACpCC,OAAST,SAASC,eAAeH,kBAChCY,eAAeD,OAAQD,UAQX1B,iBACb6B,KAAOX,SAASY,cAAc,QAAQD,MAErCE,QAASC,gBAAkB9B,QAAQC,IAAI,EAAC,yBAvD5B8B,SAuDwDJ,KAvD3CK,gBAC7BC,EAAEC,IAAIC,6CAAoCF,EAAEC,IAAIE,oBAAWL,WAChEM,MAAKC,UAAYA,SAASC,YAFLR,IAAAA,SAwDnBF,QAAQW,QAAQb,KAAMG,WAE1BW,SAWMC,WAAa,eAACC,QAACA,QAAU,6DAAQ,UAC/BA,UAIA/C,eAAe+C,QACR/C,eAAe+C,QAGnB,KAkCLC,kBAAoB,CAACnB,OAAQI,QAASL,QAASmB,iBAC3ChB,KAAOX,SAASY,cAAc,QAAQD,KAEtCkB,OAASC,OAAOC,OAAO,IAAI,uCAA2B,CAExDC,SAAUC,gBAIVxB,OAAAA,OAKAyB,WAAY,IAKZC,OAAQ1B,OAAO2B,cAAgB,OAK/BrB,SAAUJ,KAKV0B,YAAa,CACT7B,QAAQ8B,KAMZC,cAAc,EAMdC,uBAAuB,EAIvBC,wBAAyB,sBAOzBC,kBAAkB,EAKlBC,yBAA0B,GAK1BC,cAAe,wFAIfjB,QAAS,IACFA,SAIPkB,KAAM,QAKNC,oBAAoB,EAIpBC,WAAW,EAIXC,SAAUxC,QAAQwC,SAKlBC,kBAAmB,eAKnBC,gBAAiB,MAKjBC,QAAS,QAKTC,oBAAoB,EAEpBC,MAAQC,SACJC,QAAQC,SAASF,OAAQ9C,SAEzB8C,OAAOG,GAAG,WAAW,gBAMZC,cAAgBC,KAAKC,cAAcF,iBAE5CJ,OAAOG,GAAG,QAAQ,wCAEIH,OAAQ,QAAS,gBAjJ1B,EAACA,OAAQ7C,cAC1BoD,0BAA4B,EAE5BA,0BADApD,OAAO2B,aACqB3B,OAAO2B,aAIP3B,OAAOqD,MAAQC,WAAWC,OAAOC,iBAAiBxD,QAAQyD,aAAe,IAExEZ,OAAOa,eAAevD,cAAc,qBAAqBwB,aAC3DyB,4BAE3BP,OAAOa,eAAevD,cAAc,qBAAqBwD,MAAMjC,iBAAY0B,kCAuInEQ,CAAiBf,OAAQ7C,WAG7BA,OAAO6D,iBAAiB,sBAAsB,wCACxBhB,OAAQ7C,WAG9BA,OAAO8D,cAAc,IAAIC,MAAM,iCAIvC3C,OAAO4C,SAAU,4BAAkB5C,OAAO4C,QAAS,UAAW,cAAc,GAC5E5C,OAAO4C,SAAU,2BAAiB5C,OAAO4C,QAAS,UAAW,QAG7D5C,OAAO4C,SAAU,4BAAkB5C,OAAO4C,QAAS,iBAAkB,aAAa,GAClF5C,OAAO4C,SAAU,4BAAkB5C,OAAO4C,QAAS,iBAAkB,CAAC,MAAO,QAG7E5C,OAAO4C,SAAU,8BAAoB5C,OAAO4C,QAAS,YAAa,gBAE3D5C,QAcL6C,uBAAyB,CAACjE,OAAQI,QAASL,QAASmE,sBAChDpF,YACFA,YADEC,aAEFA,cACAmF,aAMEC,eAAiBhD,kBAAkBnB,OAAQI,EAASL,QAASjB,oBAK/DqF,eAAeC,KAAKC,OACpBF,eAAeC,KAAKC,KAAKC,MAAQ,IAKjCH,eAAeC,KAAKG,SACpBJ,eAAeC,KAAKG,OAAOD,MAAQH,eAAeC,KAAKG,OAAOD,MAEzDE,QAAQ,cAAe,IACvBA,QAAQ,cAAe,IAGvBA,QAAQ,eAAgB,IAGxBA,QAAQ,aAAc,IAGtBA,QAAQ,WAAY,IAGpBC,WAAW,UAAW,MAI/BN,eAAeO,4BAA8BP,eAAeO,4BAA4BF,QAAQ,QAAS,eAMzGzF,aAAaG,QAAQH,cAAmD,mBAA3BA,aAAa4F,YAA0BC,SAAS7F,qBACnF8F,uBAAyB9F,aAAa4F,UAAUR,eAAgBpE,SACtEsB,OAAOC,OAAO6C,eAAgBU,2BAIlCxD,OAAOC,OAAO6C,eAAgBrB,QAAQgC,8BAA8B/E,UAE7DoE,gBASLY,YAAe/E,UACRA,OAAOgF,QAAQ,yBAUf/E,eAAiB5B,eAAM2B,YAAQD,+DAAU,SAC5CL,SAAWJ,sBAAsBU,WACnCN,gBACOnB,QAAQM,QAAQa,gBAIrBuF,eAAiB,IAAIC,iBAAQ,qCAG7BhE,QAAUD,WAAWlB,UAGpBK,QAAS8D,oBAAsB3F,QAAQC,IAAI,EAC9C,wBACAJ,iBAAiBiD,OAAO8D,KAAKjE,YAUjCd,QAAQT,MAAMT,QAAQ2D,SAAYA,OAAOuC,aAAaC,cAAaT,SAAS/B,SACxEA,OAAOhD,kBAILyF,eAAiBlF,QAAQmF,cAAc5F,IAAIK,OAAOwF,OACpDF,eAAgB,IACZA,eAAeF,eAAiBpF,cAChCiF,eAAepG,UACRN,QAAQM,QAAQyG,sBAEvBL,eAAepG,UACT,IAAI4G,MAAM,2EAKlBtB,eAAiBF,uBAAuBjE,OAAQI,EAASL,QAASmE,eAIjErB,cAAgBzC,QAAQsF,KAAKvB,uBAGpCnE,OAAO2F,QAAQC,UAAY,SAG3B3H,YAAY4H,IAAI7F,OAAQ6C,QACxBA,OAAOG,GAAG,UAAU8C,YAAC9F,OAACA,cAElB/B,YAAY8H,OAAO/F,OAAOgG,WAC1BhG,OAAOgG,UAAUL,QAAQC,UAAY,QAOrC5F,OAAOiG,0BACAjG,OAAOiG,MAAMjD,GAAG,UAAU,KAC7BH,OAAOqD,UAKfrD,OAAOG,GAAG,QAAQ,KACdH,OAAOqD,UAIXrD,OAAOG,GAAG,cAAc,WACdmD,OAAS5G,SAAS6G,iBAAiB,yBACrCD,QACAA,OAAOvB,SAASyB,QACPA,MAAMC,UAAUC,SAAS,SAC1BF,MAAMC,UAAUE,IAAI,cAOpC3D,OAAOG,GAAG,eAAe,QACjB+B,YAAY/E,QAAS,OACfmG,OAAS5G,SAAS6G,iBAAiB,yBACrCD,QACAA,OAAOvB,SAASyB,QACRA,MAAMC,UAAUC,SAAS,SACzBF,MAAMC,UAAUzG,OAAO,eAO3CoF,eAAepG,UACRgE,+EAU2B,eAAC9C,+DAAU,GAC7C5B,eAAiB4B"}
\ No newline at end of file
+{"version":3,"file":"editor.min.js","sources":["../src/editor.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * TinyMCE Editor Manager.\n *\n * @module editor_tiny/editor\n * @copyright  2022 Andrew Lyons <andrew@nicols.co.uk>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport jQuery from 'jquery';\nimport Pending from 'core/pending';\nimport {getDefaultConfiguration} from './defaults';\nimport {getTinyMCE, baseUrl} from './loader';\nimport * as Options from './options';\nimport {addToolbarButton, addToolbarButtons, addToolbarSection,\n    removeToolbarButton, removeSubmenuItem, updateEditorState} from './utils';\n\n/**\n * Storage for the TinyMCE instances on the page.\n * @type {Map}\n */\nconst instanceMap = new Map();\n\n/**\n * The default editor configuration.\n * @type {Object}\n */\nlet defaultOptions = {};\n\n/**\n * Require the modules for the named set of TinyMCE plugins.\n *\n * @param {string[]} pluginList The list of plugins\n * @return {Promise[]} A matching set of Promises relating to the requested plugins\n */\nconst importPluginList = async(pluginList) => {\n    // Fetch all of the plugins from the list of plugins.\n    // If a plugin contains a '/' then it is assumed to be a Moodle AMD module to import.\n    const pluginHandlers = await Promise.all(pluginList.map(pluginPath => {\n        if (pluginPath.indexOf('/') === -1) {\n            // A standard TinyMCE Plugin.\n            return Promise.resolve(pluginPath);\n        }\n\n        return import(pluginPath);\n    }));\n\n    // Normalise the plugin data to a list of plugin names.\n    // Two formats are supported:\n    // - a string; and\n    // - an array whose first element is the plugin name, and the second element is the plugin configuration.\n    const pluginNames = pluginHandlers.map((pluginConfig) => {\n        if (typeof pluginConfig === 'string') {\n            return pluginConfig;\n        }\n        if (Array.isArray(pluginConfig)) {\n            return pluginConfig[0];\n        }\n        return null;\n    }).filter((value) => value);\n\n    // Fetch the list of pluginConfig handlers.\n    const pluginConfig = pluginHandlers.map((pluginConfig) => {\n        if (Array.isArray(pluginConfig)) {\n            return pluginConfig[1];\n        }\n        return null;\n    }).filter((value) => value);\n\n    return {\n        pluginNames,\n        pluginConfig,\n    };\n};\n\n/**\n * Fetch the language data for the specified language.\n *\n * @param {string} language The language identifier\n * @returns {object}\n */\nconst fetchLanguage = (language) => fetch(\n    `${M.cfg.wwwroot}/lib/editor/tiny/lang.php/${M.cfg.langrev}/${language}`\n).then(response => response.json());\n\n/**\n * Get a list of all Editors in a Map, keyed by the DOM Node that the Editor is associated with.\n *\n * @returns {Map<Node, Editor>}\n */\nexport const getAllInstances = () => new Map(instanceMap.entries());\n\n/**\n * Get the TinyMCE instance for the specified Node ID.\n *\n * @param {string} elementId\n * @returns {TinyMCE|undefined}\n */\nexport const getInstanceForElementId = elementId => getInstanceForElement(document.getElementById(elementId));\n\n/*\n * Get the TinyMCE instance for the specified HTMLElement.\n *\n * @param {HTMLElement} element\n * @returns {TinyMCE|undefined}\n */\nexport const getInstanceForElement = element => {\n    const instance = instanceMap.get(element);\n    if (instance && instance.removed) {\n        instanceMap.remove(element);\n        return undefined;\n    }\n    return instance;\n};\n\n/**\n * Set up TinyMCE for the selector at the specified HTML Node id.\n *\n * @param {object} config The configuration required to setup the editor\n * @param {string} config.elementId The HTML Node ID\n * @param {Object} config.options The editor plugin configuration\n * @return {Promise<TinyMCE>} The TinyMCE instance\n */\nexport const setupForElementId = ({elementId, options}) => {\n    const target = document.getElementById(elementId);\n    return setupForTarget(target, options);\n};\n\n/**\n * Initialise the page with standard TinyMCE requirements.\n *\n * Currently this includes the language taken from the HTML lang property.\n */\nconst initialisePage = async() => {\n    const lang = document.querySelector('html').lang;\n\n    const [tinyMCE, langData] = await Promise.all([getTinyMCE(), fetchLanguage(lang)]);\n    tinyMCE.addI18n(lang, langData);\n};\ninitialisePage();\n\n/**\n * Get the list of plugins to load for the specified configuration.\n *\n * If the specified configuration does not include a plugin configuration, then return the default configuration.\n *\n * @param {object} options\n * @param {array} [options.plugins=null] The plugin list\n * @returns {object}\n */\nconst getPlugins = ({plugins = null} = {}) => {\n    if (plugins) {\n        return plugins;\n    }\n\n    if (defaultOptions.plugins) {\n        return defaultOptions.plugins;\n    }\n\n    return {};\n};\n\n/**\n * Adjust the editor size base on the target element.\n *\n * @param {TinyMCE} editor TinyMCE editor\n * @param {Node} target Target element\n */\nconst adjustEditorSize = (editor, target) => {\n    let expectedEditingAreaHeight = 0;\n    if (target.clientHeight) {\n        expectedEditingAreaHeight = target.clientHeight;\n    } else {\n        // If the target element is hidden, we cannot get the lineHeight of the target element.\n        // We don't have a proper way to retrieve the general lineHeight of the theme, so we use 22 here, it's equivalent to 1.5em.\n        expectedEditingAreaHeight = target.rows * (parseFloat(window.getComputedStyle(target).lineHeight) || 22);\n    }\n    const currentEditingAreaHeight = editor.getContainer().querySelector('.tox-sidebar-wrap').clientHeight;\n    if (currentEditingAreaHeight < expectedEditingAreaHeight) {\n        // Change the height based on the target element's height.\n        editor.getContainer().querySelector('.tox-sidebar-wrap').style.height = `${expectedEditingAreaHeight}px`;\n    }\n};\n\n/**\n * Get the standard configuration for the specified options.\n *\n * @param {Node} target\n * @param {tinyMCE} tinyMCE\n * @param {object} options\n * @param {Array} plugins\n * @returns {object}\n */\nconst getStandardConfig = (target, tinyMCE, options, plugins) => {\n    const lang = document.querySelector('html').lang;\n\n    const config = Object.assign({}, getDefaultConfiguration(), {\n        // eslint-disable-next-line camelcase\n        base_url: baseUrl,\n\n        // Set the editor target.\n        // https://www.tiny.cloud/docs/tinymce/6/editor-important-options/#target\n        target,\n\n        // https://www.tiny.cloud/docs/tinymce/6/customize-ui/#set-maximum-and-minimum-heights-and-widths\n        // Set the minimum height to the smallest height that we can fit the Menu bar, Tool bar, Status bar and the text area.\n        // eslint-disable-next-line camelcase\n        min_height: 175,\n\n        // Base the height on the size of the text area.\n        // In some cases, E.g.: The target is an advanced element, it will be hidden. We cannot get the height at this time.\n        // So set the height to auto, and adjust it later by adjustEditorSize().\n        height: target.clientHeight || 'auto',\n\n        // Set the language.\n        // https://www.tiny.cloud/docs/tinymce/6/ui-localization/#language\n        // eslint-disable-next-line camelcase\n        language: lang,\n\n        // Load the editor stylesheet into the editor iframe.\n        // https://www.tiny.cloud/docs/tinymce/6/add-css-options/\n        // eslint-disable-next-line camelcase\n        content_css: [\n            options.css,\n        ],\n\n        // Do not convert URLs to relative URLs.\n        // https://www.tiny.cloud/docs/tinymce/6/url-handling/#convert_urls\n        // eslint-disable-next-line camelcase\n        convert_urls: false,\n\n        // Enabled 'advanced' a11y options.\n        // This includes allowing role=\"presentation\" from the image uploader.\n        // https://www.tiny.cloud/docs/tinymce/6/accessibility/\n        // eslint-disable-next-line camelcase\n        a11y_advanced_options: true,\n\n        // Add specific rules to the valid elements.\n        // eslint-disable-next-line camelcase\n        extended_valid_elements: 'script[*],p[*],i[*]',\n\n        // Disable XSS Sanitisation.\n        // We do this in PHP.\n        // https://www.tiny.cloud/docs/tinymce/6/security/#turning-dompurify-off\n        // Note: This feature has been backported from TinyMCE 6.4.0.\n        // eslint-disable-next-line camelcase\n        xss_sanitization: false,\n\n        // Disable quickbars entirely.\n        // The UI is not ideal and we'll wait for it to improve in future before we enable it in Moodle.\n        // eslint-disable-next-line camelcase\n        quickbars_insert_toolbar: '',\n\n        // Override the standard block formats property (removing h1 & h2).\n        // https://www.tiny.cloud/docs/tinymce/6/user-formatting-options/#block_formats\n        // eslint-disable-next-line camelcase\n        block_formats: 'Paragraph=p;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre',\n\n        // The list of plugins to include in the instance.\n        // https://www.tiny.cloud/docs/tinymce/6/editor-important-options/#plugins\n        plugins: [\n            ...plugins,\n        ],\n\n        // Skins\n        skin: 'oxide',\n\n        // Do not show the help link in the status bar.\n        // https://www.tiny.cloud/docs/tinymce/latest/accessibility/#help_accessibility\n        // eslint-disable-next-line camelcase\n        help_accessibility: false,\n\n        // Remove the \"Upgrade\" link for Tiny.\n        // https://www.tiny.cloud/docs/tinymce/6/editor-premium-upgrade-promotion/\n        promotion: false,\n\n        // Allow the administrator to disable branding.\n        // https://www.tiny.cloud/docs/tinymce/6/statusbar-configuration-options/#branding\n        branding: options.branding,\n\n        // Put th cells in a thead element.\n        // https://www.tiny.cloud/docs/tinymce/6/table-options/#table_header_type\n        // eslint-disable-next-line camelcase\n        table_header_type: 'sectionCells',\n\n        // Stored text in non-entity form.\n        // https://www.tiny.cloud/docs/tinymce/6/content-filtering/#entity_encoding\n        // eslint-disable-next-line camelcase\n        entity_encoding: \"raw\",\n\n        // Enable support for editors in scrollable containers.\n        // https://www.tiny.cloud/docs/tinymce/6/ui-mode-configuration-options/#ui_mode\n        // eslint-disable-next-line camelcase\n        ui_mode: 'split',\n\n        // Enable browser-supported spell checking.\n        // https://www.tiny.cloud/docs/tinymce/latest/spelling/\n        // eslint-disable-next-line camelcase\n        browser_spellcheck: true,\n\n        setup: (editor) => {\n            Options.register(editor, options);\n\n            editor.on('PreInit', function() {\n                // Work around a bug in TinyMCE with Firefox.\n                // When an editor is removed, and replaced with an identically attributed editor (same ID),\n                // and the Firefox window is freshly opened (e.g. Behat, Private browsing), the wrong contentWindow\n                // is assigned to the editor instance leading to an NS_ERROR_UNEXPECTED error in Firefox.\n                // This is a workaround for that issue.\n                this.contentWindow = this.iframeElement.contentWindow;\n            });\n            editor.on('init', function() {\n                // Hide justify alignment sub-menu.\n                removeSubmenuItem(editor, 'align', 'tiny:justify');\n                // Adjust the editor size.\n                adjustEditorSize(editor, target);\n            });\n\n            target.addEventListener('form:editorUpdated', function() {\n                updateEditorState(editor, target);\n            });\n\n            target.dispatchEvent(new Event('form:editorUpdated'));\n        },\n    });\n\n    config.toolbar = addToolbarSection(config.toolbar, 'content', 'formatting', true);\n    config.toolbar = addToolbarButton(config.toolbar, 'content', 'link');\n\n    // Add directionality plugins, always.\n    config.toolbar = addToolbarSection(config.toolbar, 'directionality', 'alignment', true);\n    config.toolbar = addToolbarButtons(config.toolbar, 'directionality', ['ltr', 'rtl']);\n\n    // Remove the align justify button from the toolbar.\n    config.toolbar = removeToolbarButton(config.toolbar, 'alignment', 'alignjustify');\n\n    return config;\n};\n\n/**\n * Fetch the TinyMCE configuration for this editor instance.\n *\n * @param {HTMLElement} target\n * @param {TinyMCE} tinyMCE The TinyMCE API\n * @param {Object} options The editor plugin configuration\n * @param {object} pluginValues\n * @param {object} pluginValues.pluginConfig The list of plugin configuration\n * @param {object} pluginValues.pluginNames The list of plugins to load\n * @returns {object} The TinyMCE Configuration\n */\nconst getEditorConfiguration = (target, tinyMCE, options, pluginValues) => {\n    const {\n        pluginNames,\n        pluginConfig,\n    } = pluginValues;\n\n    // Allow plugins to modify the configuration.\n    // This seems a little strange, but we must double-process the config slightly.\n\n    // First we fetch the standard configuration.\n    const instanceConfig = getStandardConfig(target, tinyMCE, options, pluginNames);\n\n    // Next we make any standard changes.\n    // Here we remove the file menu, as it doesn't offer any useful functionality.\n    // We only empty the items list so that a plugin may choose to add to it themselves later if they wish.\n    if (instanceConfig.menu.file) {\n        instanceConfig.menu.file.items = '';\n    }\n\n    // We disable the styles, backcolor, and forecolor plugins from the format menu.\n    // These are not useful for Moodle and we don't want to encourage their use.\n    if (instanceConfig.menu.format) {\n        instanceConfig.menu.format.items = instanceConfig.menu.format.items\n            // Remove forecolor and backcolor.\n            .replace(/forecolor ?/, '')\n            .replace(/backcolor ?/, '')\n\n            // Remove fontfamily for now.\n            .replace(/fontfamily ?/, '')\n\n            // Remove fontsize for now.\n            .replace(/fontsize ?/, '')\n\n            // Remove styles - it just duplicates the format menu in a way which does not respect configuration\n            .replace(/styles ?/, '')\n\n            // Remove any duplicate separators.\n            .replaceAll(/\\| *\\|/g, '|');\n    }\n\n    // eslint-disable-next-line camelcase\n    instanceConfig.quickbars_selection_toolbar = instanceConfig.quickbars_selection_toolbar.replace('h2 h3', 'h3 h4 h5 h6');\n\n    // Next we call the `configure` function for any plugin which defines it.\n    // We pass the current instanceConfig in here, to allow them to make certain changes to the global configuration.\n    // For example, to add themselves to any menu, toolbar, and so on.\n    // Any plugin which wishes to have configuration options must register those options here.\n    pluginConfig.filter((pluginConfig) => typeof pluginConfig.configure === 'function').forEach((pluginConfig) => {\n        const pluginInstanceOverride = pluginConfig.configure(instanceConfig, options);\n        Object.assign(instanceConfig, pluginInstanceOverride);\n    });\n\n    // Next we convert the plugin configuration into a format that TinyMCE understands.\n    Object.assign(instanceConfig, Options.getInitialPluginConfiguration(options));\n\n    return instanceConfig;\n};\n\n/**\n * Check if the target for TinyMCE is in a modal or not.\n *\n * @param {HTMLElement} target Target to check\n * @returns {boolean} True if the target is in a modal form.\n */\nconst isModalMode = (target) => {\n    return !!target.closest('[data-region=\"modal\"]');\n};\n\n/**\n * Set up TinyMCE for the HTML Element.\n *\n * @param {HTMLElement} target\n * @param {Object} [options={}] The editor plugin configuration\n * @return {Promise<TinyMCE>} The TinyMCE instance\n */\nexport const setupForTarget = async(target, options = {}) => {\n    const instance = getInstanceForElement(target);\n    if (instance) {\n        return Promise.resolve(instance);\n    }\n\n    // Register a new pending promise to ensure that Behat waits for the editor setup to complete before continuing.\n    const pendingPromise = new Pending('editor_tiny/editor:setupForTarget');\n\n    // Get the list of plugins.\n    const plugins = getPlugins(options);\n\n    // Fetch the tinyMCE API, and instantiate the plugins.\n    const [tinyMCE, pluginValues] = await Promise.all([\n        getTinyMCE(),\n        importPluginList(Object.keys(plugins)),\n    ]);\n\n    // TinyMCE uses the element ID as a map key internally, even if the target has changed.\n    // In the case where we have an editor in a modal form which has been detached from the DOM, but the editor not removed,\n    // we need to manually destroy the editor.\n    // We could theoretically do this with a Mutation Observer, but in some cases the Node may be moved,\n    // or added back elsewhere in the DOM.\n\n    // First remove any detached editors.\n    tinyMCE.get().filter((editor) => !editor.getElement().isConnected).forEach((editor) => {\n        editor.remove();\n    });\n\n    // Now check for any existing editor which shares the same ID.\n    const existingEditor = tinyMCE.EditorManager.get(target.id);\n    if (existingEditor) {\n        if (existingEditor.getElement() === target) {\n            pendingPromise.resolve();\n            return Promise.resolve(existingEditor);\n        } else {\n            pendingPromise.resolve();\n            throw new Error('TinyMCE instance already exists for different target with same ID');\n        }\n    }\n\n    // Get the editor configuration for this editor.\n    const instanceConfig = getEditorConfiguration(target, tinyMCE, options, pluginValues);\n\n    // Initialise the editor instance for the given configuration.\n    // At this point any plugin which has configuration options registered will have them applied for this instance.\n    const [editor] = await tinyMCE.init(instanceConfig);\n\n    // Update the textarea when the editor to set the field type for Behat.\n    target.dataset.fieldtype = 'editor';\n\n    // Store the editor instance in the instanceMap and register a listener on removal to remove it from the map.\n    instanceMap.set(target, editor);\n    editor.on('remove', ({target}) => {\n        // Handle removal of the editor from the map on destruction.\n        instanceMap.delete(target.targetElm);\n        target.targetElm.dataset.fieldtype = null;\n    });\n\n    // If the editor is part of a form, also listen to the jQuery submit event.\n    // The jQuery submit event will not trigger the native submit event, and therefore the content will not be saved.\n    // We cannot rely on listening to the bubbled submit event on the document because other events on child nodes may\n    // consume the data before it is saved.\n    if (target.form) {\n        jQuery(target.form).on('submit', () => {\n            editor.save();\n        });\n    }\n\n    // Save the editor content to the textarea when the editor is blurred.\n    editor.on('blur', () => {\n        editor.save();\n    });\n\n    // If the editor is in a modal, we need to hide the modal when window editor's window is opened.\n    editor.on('OpenWindow', () => {\n        const modals = document.querySelectorAll('[data-region=\"modal\"]');\n        if (modals) {\n            modals.forEach((modal) => {\n                if (!modal.classList.contains('hide')) {\n                    modal.classList.add('hide');\n                }\n            });\n        }\n    });\n\n    // If the editor's window is closed, we need to show the hidden modal back.\n    editor.on('CloseWindow', () => {\n        if (isModalMode(target)) {\n            const modals = document.querySelectorAll('[data-region=\"modal\"]');\n            if (modals) {\n                modals.forEach((modal) => {\n                    if (modal.classList.contains('hide')) {\n                        modal.classList.remove('hide');\n                    }\n                });\n            }\n        }\n    });\n\n    pendingPromise.resolve();\n    return editor;\n};\n\n/**\n * Set the default editor configuration.\n *\n * This configuration is used when an editor is initialised without any configuration.\n *\n * @param {object} [options={}]\n */\nexport const configureDefaultEditor = (options = {}) => {\n    defaultOptions = options;\n};\n"],"names":["instanceMap","Map","defaultOptions","importPluginList","async","pluginHandlers","Promise","all","pluginList","map","pluginPath","indexOf","resolve","pluginNames","pluginConfig","Array","isArray","filter","value","entries","elementId","getInstanceForElement","document","getElementById","element","instance","get","removed","remove","_ref","options","target","setupForTarget","lang","querySelector","tinyMCE","langData","language","fetch","M","cfg","wwwroot","langrev","then","response","json","addI18n","initialisePage","getPlugins","plugins","getStandardConfig","config","Object","assign","base_url","baseUrl","min_height","height","clientHeight","content_css","css","convert_urls","a11y_advanced_options","extended_valid_elements","xss_sanitization","quickbars_insert_toolbar","block_formats","skin","help_accessibility","promotion","branding","table_header_type","entity_encoding","ui_mode","browser_spellcheck","setup","editor","Options","register","on","contentWindow","this","iframeElement","expectedEditingAreaHeight","rows","parseFloat","window","getComputedStyle","lineHeight","getContainer","style","adjustEditorSize","addEventListener","dispatchEvent","Event","toolbar","getEditorConfiguration","pluginValues","instanceConfig","menu","file","items","format","replace","replaceAll","quickbars_selection_toolbar","configure","forEach","pluginInstanceOverride","getInitialPluginConfiguration","isModalMode","closest","pendingPromise","Pending","keys","getElement","isConnected","existingEditor","EditorManager","id","Error","init","dataset","fieldtype","set","_ref2","delete","targetElm","form","save","modals","querySelectorAll","modal","classList","contains","add"],"mappings":"4oDAmCMA,YAAc,IAAIC,QAMpBC,eAAiB,SAQfC,iBAAmBC,MAAAA,mBAGfC,qBAAuBC,QAAQC,IAAIC,WAAWC,KAAIC,aACnB,IAA7BA,WAAWC,QAAQ,KAEZL,QAAQM,QAAQF,4NAGbA,4WAAAA,gBAOZG,YAAcR,eAAeI,KAAKK,cACR,iBAAjBA,aACAA,aAEPC,MAAMC,QAAQF,cACPA,aAAa,GAEjB,OACRG,QAAQC,OAAUA,cAUd,CACHL,YAAAA,YACAC,aATiBT,eAAeI,KAAKK,cACjCC,MAAMC,QAAQF,cACPA,aAAa,GAEjB,OACRG,QAAQC,OAAUA,mCAuBM,IAAM,IAAIjB,IAAID,YAAYmB,4CAQlBC,WAAaC,sBAAsBC,SAASC,eAAeH,kBAQrFC,sBAAwBG,gBAC3BC,SAAWzB,YAAY0B,IAAIF,aAC7BC,WAAYA,SAASE,eAIlBF,SAHHzB,YAAY4B,OAAOJ,0FAcMK,WAACT,UAACA,UAADU,QAAYA,oBACpCC,OAAST,SAASC,eAAeH,kBAChCY,eAAeD,OAAQD,UAQX1B,iBACb6B,KAAOX,SAASY,cAAc,QAAQD,MAErCE,QAASC,gBAAkB9B,QAAQC,IAAI,EAAC,yBAvD5B8B,SAuDwDJ,KAvD3CK,gBAC7BC,EAAEC,IAAIC,6CAAoCF,EAAEC,IAAIE,oBAAWL,WAChEM,MAAKC,UAAYA,SAASC,YAFLR,IAAAA,SAwDnBF,QAAQW,QAAQb,KAAMG,WAE1BW,SAWMC,WAAa,eAACC,QAACA,QAAU,6DAAQ,UAC/BA,UAIA/C,eAAe+C,QACR/C,eAAe+C,QAGnB,KAkCLC,kBAAoB,CAACnB,OAAQI,QAASL,QAASmB,iBAC3ChB,KAAOX,SAASY,cAAc,QAAQD,KAEtCkB,OAASC,OAAOC,OAAO,IAAI,uCAA2B,CAExDC,SAAUC,gBAIVxB,OAAAA,OAKAyB,WAAY,IAKZC,OAAQ1B,OAAO2B,cAAgB,OAK/BrB,SAAUJ,KAKV0B,YAAa,CACT7B,QAAQ8B,KAMZC,cAAc,EAMdC,uBAAuB,EAIvBC,wBAAyB,sBAOzBC,kBAAkB,EAKlBC,yBAA0B,GAK1BC,cAAe,mFAIfjB,QAAS,IACFA,SAIPkB,KAAM,QAKNC,oBAAoB,EAIpBC,WAAW,EAIXC,SAAUxC,QAAQwC,SAKlBC,kBAAmB,eAKnBC,gBAAiB,MAKjBC,QAAS,QAKTC,oBAAoB,EAEpBC,MAAQC,SACJC,QAAQC,SAASF,OAAQ9C,SAEzB8C,OAAOG,GAAG,WAAW,gBAMZC,cAAgBC,KAAKC,cAAcF,iBAE5CJ,OAAOG,GAAG,QAAQ,wCAEIH,OAAQ,QAAS,gBAjJ1B,EAACA,OAAQ7C,cAC1BoD,0BAA4B,EAE5BA,0BADApD,OAAO2B,aACqB3B,OAAO2B,aAIP3B,OAAOqD,MAAQC,WAAWC,OAAOC,iBAAiBxD,QAAQyD,aAAe,IAExEZ,OAAOa,eAAevD,cAAc,qBAAqBwB,aAC3DyB,4BAE3BP,OAAOa,eAAevD,cAAc,qBAAqBwD,MAAMjC,iBAAY0B,kCAuInEQ,CAAiBf,OAAQ7C,WAG7BA,OAAO6D,iBAAiB,sBAAsB,wCACxBhB,OAAQ7C,WAG9BA,OAAO8D,cAAc,IAAIC,MAAM,iCAIvC3C,OAAO4C,SAAU,4BAAkB5C,OAAO4C,QAAS,UAAW,cAAc,GAC5E5C,OAAO4C,SAAU,2BAAiB5C,OAAO4C,QAAS,UAAW,QAG7D5C,OAAO4C,SAAU,4BAAkB5C,OAAO4C,QAAS,iBAAkB,aAAa,GAClF5C,OAAO4C,SAAU,4BAAkB5C,OAAO4C,QAAS,iBAAkB,CAAC,MAAO,QAG7E5C,OAAO4C,SAAU,8BAAoB5C,OAAO4C,QAAS,YAAa,gBAE3D5C,QAcL6C,uBAAyB,CAACjE,OAAQI,QAASL,QAASmE,sBAChDpF,YACFA,YADEC,aAEFA,cACAmF,aAMEC,eAAiBhD,kBAAkBnB,OAAQI,EAASL,QAASjB,oBAK/DqF,eAAeC,KAAKC,OACpBF,eAAeC,KAAKC,KAAKC,MAAQ,IAKjCH,eAAeC,KAAKG,SACpBJ,eAAeC,KAAKG,OAAOD,MAAQH,eAAeC,KAAKG,OAAOD,MAEzDE,QAAQ,cAAe,IACvBA,QAAQ,cAAe,IAGvBA,QAAQ,eAAgB,IAGxBA,QAAQ,aAAc,IAGtBA,QAAQ,WAAY,IAGpBC,WAAW,UAAW,MAI/BN,eAAeO,4BAA8BP,eAAeO,4BAA4BF,QAAQ,QAAS,eAMzGzF,aAAaG,QAAQH,cAAmD,mBAA3BA,aAAa4F,YAA0BC,SAAS7F,qBACnF8F,uBAAyB9F,aAAa4F,UAAUR,eAAgBpE,SACtEsB,OAAOC,OAAO6C,eAAgBU,2BAIlCxD,OAAOC,OAAO6C,eAAgBrB,QAAQgC,8BAA8B/E,UAE7DoE,gBASLY,YAAe/E,UACRA,OAAOgF,QAAQ,yBAUf/E,eAAiB5B,eAAM2B,YAAQD,+DAAU,SAC5CL,SAAWJ,sBAAsBU,WACnCN,gBACOnB,QAAQM,QAAQa,gBAIrBuF,eAAiB,IAAIC,iBAAQ,qCAG7BhE,QAAUD,WAAWlB,UAGpBK,QAAS8D,oBAAsB3F,QAAQC,IAAI,EAC9C,wBACAJ,iBAAiBiD,OAAO8D,KAAKjE,YAUjCd,QAAQT,MAAMT,QAAQ2D,SAAYA,OAAOuC,aAAaC,cAAaT,SAAS/B,SACxEA,OAAOhD,kBAILyF,eAAiBlF,QAAQmF,cAAc5F,IAAIK,OAAOwF,OACpDF,eAAgB,IACZA,eAAeF,eAAiBpF,cAChCiF,eAAepG,UACRN,QAAQM,QAAQyG,sBAEvBL,eAAepG,UACT,IAAI4G,MAAM,2EAKlBtB,eAAiBF,uBAAuBjE,OAAQI,EAASL,QAASmE,eAIjErB,cAAgBzC,QAAQsF,KAAKvB,uBAGpCnE,OAAO2F,QAAQC,UAAY,SAG3B3H,YAAY4H,IAAI7F,OAAQ6C,QACxBA,OAAOG,GAAG,UAAU8C,YAAC9F,OAACA,cAElB/B,YAAY8H,OAAO/F,OAAOgG,WAC1BhG,OAAOgG,UAAUL,QAAQC,UAAY,QAOrC5F,OAAOiG,0BACAjG,OAAOiG,MAAMjD,GAAG,UAAU,KAC7BH,OAAOqD,UAKfrD,OAAOG,GAAG,QAAQ,KACdH,OAAOqD,UAIXrD,OAAOG,GAAG,cAAc,WACdmD,OAAS5G,SAAS6G,iBAAiB,yBACrCD,QACAA,OAAOvB,SAASyB,QACPA,MAAMC,UAAUC,SAAS,SAC1BF,MAAMC,UAAUE,IAAI,cAOpC3D,OAAOG,GAAG,eAAe,QACjB+B,YAAY/E,QAAS,OACfmG,OAAS5G,SAAS6G,iBAAiB,yBACrCD,QACAA,OAAOvB,SAASyB,QACRA,MAAMC,UAAUC,SAAS,SACzBF,MAAMC,UAAUzG,OAAO,eAO3CoF,eAAepG,UACRgE,+EAU2B,eAAC9C,+DAAU,GAC7C5B,eAAiB4B"}
\ No newline at end of file
diff --git a/lib/editor/tiny/amd/src/editor.js b/lib/editor/tiny/amd/src/editor.js
index 361ecaf710e9e..65760cf47e596 100644
--- a/lib/editor/tiny/amd/src/editor.js
+++ b/lib/editor/tiny/amd/src/editor.js
@@ -268,7 +268,7 @@ const getStandardConfig = (target, tinyMCE, options, plugins) => {
         // Override the standard block formats property (removing h1 & h2).
         // https://www.tiny.cloud/docs/tinymce/6/user-formatting-options/#block_formats
         // eslint-disable-next-line camelcase
-        block_formats: 'Paragraph=p; Heading 3=h3; Heading 4=h4; Heading 5=h5; Heading 6=h6; Preformatted=pre',
+        block_formats: 'Paragraph=p;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre',
 
         // The list of plugins to include in the instance.
         // https://www.tiny.cloud/docs/tinymce/6/editor-important-options/#plugins

From 78eeb7ea574dd5d69aaa32910c9904cae7e5e66e Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Wed, 17 Apr 2024 17:50:02 +0100
Subject: [PATCH 51/75] MDL-81587 quiz: fix layout of the add/edit random UI

Some of the removed CSS seems no longer relevant now that we have
customisation options for the layout of the question bank.
---
 .../question/bank/preview_action_column.php   |  8 +++++++
 .../bank/question_name_text_column.php        | 10 ++++++++
 .../question/bank/random_question_view.php    | 24 +++++++------------
 theme/boost/scss/moodle/question.scss         | 16 +------------
 theme/boost/style/moodle.css                  | 12 +---------
 theme/classic/style/moodle.css                | 12 +---------
 6 files changed, 30 insertions(+), 52 deletions(-)

diff --git a/mod/quiz/classes/question/bank/preview_action_column.php b/mod/quiz/classes/question/bank/preview_action_column.php
index 3ef99150ed7ee..7babf66f9fdd0 100644
--- a/mod/quiz/classes/question/bank/preview_action_column.php
+++ b/mod/quiz/classes/question/bank/preview_action_column.php
@@ -31,14 +31,22 @@ public function get_extra_classes(): array {
         return ['iconcol'];
     }
 
+    #[\Override]
     public function get_title(): string {
         return '&#160;';
     }
 
+    #[\Override]
     public function get_name() {
         return 'previewquestionaction';
     }
 
+    #[\Override]
+    public function get_default_width(): int {
+        return 45;
+    }
+
+    #[\Override]
     protected function display_content($question, $rowclasses) {
         global $PAGE;
         if (!question_has_capability_on($question, 'use')) {
diff --git a/mod/quiz/classes/question/bank/question_name_text_column.php b/mod/quiz/classes/question/bank/question_name_text_column.php
index 9e6e568d029f7..41d4bad8cb208 100644
--- a/mod/quiz/classes/question/bank/question_name_text_column.php
+++ b/mod/quiz/classes/question/bank/question_name_text_column.php
@@ -27,10 +27,18 @@
  */
 class question_name_text_column extends question_name_column {
 
+    #[\Override]
     public function get_name(): string {
         return 'questionnametext';
     }
 
+    #[\Override]
+    public function get_default_width(): int {
+        // In the places this is used, this seems to make it use all the available space, without overflowing.
+        return 800;
+    }
+
+    #[\Override]
     protected function display_content($question, $rowclasses): void {
         echo \html_writer::start_tag('div');
         $labelfor = $this->label_for($question);
@@ -44,6 +52,7 @@ protected function display_content($question, $rowclasses): void {
         echo \html_writer::end_tag('div');
     }
 
+    #[\Override]
     public function get_required_fields(): array {
         $fields = parent::get_required_fields();
         $fields[] = 'q.questiontext';
@@ -52,6 +61,7 @@ public function get_required_fields(): array {
         return $fields;
     }
 
+    #[\Override]
     public function load_additional_data(array $questions) {
         parent::load_additional_data($questions);
         parent::load_question_tags($questions);
diff --git a/mod/quiz/classes/question/bank/random_question_view.php b/mod/quiz/classes/question/bank/random_question_view.php
index 57bfb70ff6aaa..19c5a4ddead0a 100644
--- a/mod/quiz/classes/question/bank/random_question_view.php
+++ b/mod/quiz/classes/question/bank/random_question_view.php
@@ -16,6 +16,8 @@
 
 namespace mod_quiz\question\bank;
 
+use qbank_viewquestiontype\question_type_column;
+
 /**
  * Subclass to customise the view of the question bank for the quiz editing screen.
  *
@@ -25,24 +27,16 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class random_question_view extends custom_view {
-    /**
-     * Init required columns.
-     *
-     * @return void
-     */
-    protected function init_required_columns(): void {
-        // Override core columns.
-        $this->corequestionbankcolumns = [
-            'question_type_column',
-            'question_name_text_column',
-            'preview_action_column'
+    #[\Override]
+    protected function get_question_bank_plugins(): array {
+        return [
+            new question_type_column($this),
+            new question_name_text_column($this),
+            new preview_action_column($this),
         ];
     }
 
-    /**
-     * Prints the table of questions in a category with interactions
-     *
-     * @param \context $catcontext*/
+    #[\Override]
     protected function display_bottom_controls(\context $catcontext): void {
     }
 }
diff --git a/theme/boost/scss/moodle/question.scss b/theme/boost/scss/moodle/question.scss
index a03f4d6c5be80..d9fbcaa177fef 100644
--- a/theme/boost/scss/moodle/question.scss
+++ b/theme/boost/scss/moodle/question.scss
@@ -147,12 +147,7 @@ table.question-bank-table {
     table-layout: fixed;
     overflow-x: scroll;
     width: min-content;
-
-    td,
-    th {
-        max-width: 40vw;
-        width: max-content;
-    }
+    max-width: 100%;
 
     th {
         text-align: left;
@@ -676,12 +671,3 @@ body.path-question-type .mform fieldset.hidden {
         margin: 0;
     }
 }
-
-@include media-breakpoint-down(md) {
-    .question-bank-table {
-        td,
-        th {
-            max-width: 75vw;
-        }
-    }
-}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index efa84f2582eb2..7da3df1d15cba 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -31975,11 +31975,7 @@ table.question-bank-table {
   table-layout: fixed;
   overflow-x: scroll;
   width: min-content;
-}
-table.question-bank-table td,
-table.question-bank-table th {
-  max-width: 40vw;
-  width: max-content;
+  max-width: 100%;
 }
 table.question-bank-table th {
   text-align: left;
@@ -32525,12 +32521,6 @@ body.path-question-type .mform fieldset.hidden {
     margin: 0;
   }
 }
-@media (max-width: 991.98px) {
-  .question-bank-table td,
-  .question-bank-table th {
-    max-width: 75vw;
-  }
-}
 /* user.less */
 .userprofile .fullprofilelink {
   text-align: center;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 84231bbec3110..2ce37cdde5402 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -31975,11 +31975,7 @@ table.question-bank-table {
   table-layout: fixed;
   overflow-x: scroll;
   width: min-content;
-}
-table.question-bank-table td,
-table.question-bank-table th {
-  max-width: 40vw;
-  width: max-content;
+  max-width: 100%;
 }
 table.question-bank-table th {
   text-align: left;
@@ -32525,12 +32521,6 @@ body.path-question-type .mform fieldset.hidden {
     margin: 0;
   }
 }
-@media (max-width: 991.98px) {
-  .question-bank-table td,
-  .question-bank-table th {
-    max-width: 75vw;
-  }
-}
 /* user.less */
 .userprofile .fullprofilelink {
   text-align: center;

From e8b63bc3a474b31f608abcdd75cbe5fd326df306 Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Tue, 30 Apr 2024 17:10:40 +0200
Subject: [PATCH 52/75] MDL-80571 tiny_premium: Fix version

---
 lib/editor/tiny/plugins/premium/db/upgrade.php | 4 ++--
 lib/editor/tiny/plugins/premium/version.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/editor/tiny/plugins/premium/db/upgrade.php b/lib/editor/tiny/plugins/premium/db/upgrade.php
index a9f2cc95d0b6b..486d5ee661bf1 100644
--- a/lib/editor/tiny/plugins/premium/db/upgrade.php
+++ b/lib/editor/tiny/plugins/premium/db/upgrade.php
@@ -38,7 +38,7 @@ function xmldb_tiny_premium_upgrade($oldversion) {
 
     // Automatically generated Moodle v4.3.0 release upgrade line.
     // Put any upgrade step following this.
-    if ($oldversion < 2024042400) {
+    if ($oldversion < 2024042201) {
 
         // Only enable the premium plugins if we have an API key.
         if (!empty(get_config('tiny_premium', 'apikey'))) {
@@ -48,7 +48,7 @@ function xmldb_tiny_premium_upgrade($oldversion) {
             };
         }
 
-        upgrade_plugin_savepoint(true, 2024042400, 'tiny', 'premium');
+        upgrade_plugin_savepoint(true, 2024042201, 'tiny', 'premium');
     }
 
     return true;
diff --git a/lib/editor/tiny/plugins/premium/version.php b/lib/editor/tiny/plugins/premium/version.php
index e7341171a242c..bd70eb2f3fe7d 100644
--- a/lib/editor/tiny/plugins/premium/version.php
+++ b/lib/editor/tiny/plugins/premium/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2024043000;
+$plugin->version = 2024042201;
 $plugin->requires = 2024041600;
 $plugin->component = 'tiny_premium';

From 6b893421dae5ee4db335fc28a4327856b848f28c Mon Sep 17 00:00:00 2001
From: Angelia Dela Cruz <andelacruz@ubiquitous-tech.com>
Date: Thu, 26 Oct 2023 14:54:37 +0800
Subject: [PATCH 53/75] MDL-79851 mod_h5pactivity: Behat for h5p activity
 access control

---
 .../behat/h5pactivity_availability.feature    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 mod/h5pactivity/tests/behat/h5pactivity_availability.feature

diff --git a/mod/h5pactivity/tests/behat/h5pactivity_availability.feature b/mod/h5pactivity/tests/behat/h5pactivity_availability.feature
new file mode 100644
index 0000000000000..b627a3a40d43e
--- /dev/null
+++ b/mod/h5pactivity/tests/behat/h5pactivity_availability.feature
@@ -0,0 +1,41 @@
+@mod @mod_h5pactivity @core_5hp
+Feature: Control H5P activity availability for students
+  In order to restrict student access to H5P activity
+  As a teacher
+  I need to control the availability of the H5P activity
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | teacher1 | Teacher   | 1        | teacher1@example.com |
+      | student1 | Student   | 1        | student1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
+    And the following "activities" exist:
+      | activity    | course | name     |
+      | h5pactivity | C1     | H5P Test |
+
+  @javascript
+  Scenario Outline: Restrict H5P activity access by date
+    Given I am on the "H5P Test" "h5pactivity activity editing" page logged in as teacher1
+    And I expand all fieldsets
+    And I click on "Add restriction..." "button"
+    And I click on "Date" "button" in the "Add restriction..." "dialogue"
+    And I set the following fields to these values:
+      | Direction | from   |
+      | x[day]    | 1      |
+      | x[month]  | 1      |
+      | x[year]   | <year> |
+    And I press "Save and return to course"
+    When I am on the "Course 1" course page logged in as student1
+    Then I <fromvisibility> see "Available from"
+
+    Examples:
+      | year                | fromvisibility |
+      | ## -1 year ## %Y ## | should not     |
+      | ## +1 year ## %Y ## | should         |

From 260b786d537146d4596faa73e13abe5da9ca92f0 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Wed, 17 Apr 2024 08:46:54 +0100
Subject: [PATCH 54/75] MDL-81754 reportbuilder: consistent filter field
 comparison labels.

---
 lang/en/reportbuilder.php                     |  7 +++++--
 reportbuilder/classes/local/filters/date.php  |  8 ++++----
 reportbuilder/classes/local/filters/user.php  |  4 +++-
 .../tests/behat/customreports.feature         | 19 +++++++++++++++++++
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/lang/en/reportbuilder.php b/lang/en/reportbuilder.php
index 2e61d15c0a6d4..aeba45202b008 100644
--- a/lang/en/reportbuilder.php
+++ b/lang/en/reportbuilder.php
@@ -126,7 +126,6 @@
 $string['filterdatebefore'] = 'Before';
 $string['filterdatecurrent'] = 'Current';
 $string['filterdatedays'] = 'day(s)';
-$string['filterdatefrom'] = 'Date from';
 $string['filterdatefuture'] = 'In the future';
 $string['filterdatehours'] = 'hour(s)';
 $string['filterdatelast'] = 'Last';
@@ -135,7 +134,6 @@
 $string['filterdatenext'] = 'Next';
 $string['filterdatepast'] = 'In the past';
 $string['filterdateseconds'] = 'second(s)';
-$string['filterdateto'] = 'Date to';
 $string['filterdateweeks'] = 'week(s)';
 $string['filterdateyears'] = 'year(s)';
 $string['filterdeleted'] = 'Deleted filter \'{$a}\'';
@@ -143,6 +141,7 @@
 $string['filterendswith'] = 'Ends with';
 $string['filterequalorgreaterthan'] = 'Greater than or equal';
 $string['filterequalorlessthan'] = 'Less than or equal';
+$string['filterfieldfrom'] = '{$a} from';
 $string['filterfieldoperator'] = '{$a} operator';
 $string['filterfieldto'] = '{$a} to';
 $string['filterfieldunit'] = '{$a} unit';
@@ -287,3 +286,7 @@
 
 // Deprecated since Moodle 4.4.
 $string['filterdurationunit'] = '{$a} unit';
+
+// Deprecated since Moodle 4.5.
+$string['filterdatefrom'] = 'Date from';
+$string['filterdateto'] = 'Date to';
diff --git a/reportbuilder/classes/local/filters/date.php b/reportbuilder/classes/local/filters/date.php
index 5661867965164..6886cd1547b76 100644
--- a/reportbuilder/classes/local/filters/date.php
+++ b/reportbuilder/classes/local/filters/date.php
@@ -151,14 +151,14 @@ public function setup_form(MoodleQuickForm $mform): void {
             ->setHiddenLabel(true);
 
         // Date selectors for range operator.
-        $mform->addElement('date_selector', "{$this->name}_from", get_string('filterdatefrom', 'core_reportbuilder'),
-            ['optional' => true]);
+        $mform->addElement('date_selector', "{$this->name}_from",
+            get_string('filterfieldfrom', 'core_reportbuilder', $this->get_header()), ['optional' => true]);
         $mform->setType("{$this->name}_from", PARAM_INT);
         $mform->setDefault("{$this->name}_from", 0);
         $mform->hideIf("{$this->name}_from", "{$this->name}_operator", 'neq', self::DATE_RANGE);
 
-        $mform->addElement('date_selector', "{$this->name}_to", get_string('filterdateto', 'core_reportbuilder'),
-            ['optional' => true]);
+        $mform->addElement('date_selector', "{$this->name}_to",
+            get_string('filterfieldto', 'core_reportbuilder', $this->get_header()), ['optional' => true]);
         $mform->setType("{$this->name}_to", PARAM_INT);
         $mform->setDefault("{$this->name}_to", 0);
         $mform->hideIf("{$this->name}_to", "{$this->name}_operator", 'neq', self::DATE_RANGE);
diff --git a/reportbuilder/classes/local/filters/user.php b/reportbuilder/classes/local/filters/user.php
index 91d7b037e5afd..a2554f430f3d3 100644
--- a/reportbuilder/classes/local/filters/user.php
+++ b/reportbuilder/classes/local/filters/user.php
@@ -72,6 +72,8 @@ public function setup_form(MoodleQuickForm $mform): void {
         $mform->setType("{$this->name}_operator", PARAM_INT);
         $mform->setDefault("{$this->name}_operator", self::USER_ANY);
 
+        // Specific user selection.
+        $valuelabel = get_string('filterfieldvalue', 'core_reportbuilder', $this->get_header());
         $options = [
             'ajax' => 'core_user/form_user_selector',
             'multiple' => true,
@@ -80,7 +82,7 @@ public function setup_form(MoodleQuickForm $mform): void {
                 return fullname($user, has_capability('moodle/site:viewfullnames', context_system::instance()));
             }
         ];
-        $mform->addElement('autocomplete', "{$this->name}_value", get_string('user'), [], $options)
+        $mform->addElement('autocomplete', "{$this->name}_value", $valuelabel, [], $options)
             ->setHiddenLabel(true);
         $mform->hideIf("{$this->name}_value", "{$this->name}_operator", 'neq', self::USER_SELECT);
     }
diff --git a/reportbuilder/tests/behat/customreports.feature b/reportbuilder/tests/behat/customreports.feature
index 3cccb734b08fd..a1fab78ee0c1e 100644
--- a/reportbuilder/tests/behat/customreports.feature
+++ b/reportbuilder/tests/behat/customreports.feature
@@ -174,6 +174,25 @@ Feature: Manage custom reports
       | Report source | Users    |
       | Tags          | Cat      |
 
+  Scenario: Filter custom reports by date
+    Given the following "core_reportbuilder > Report" exists:
+      | name    | My report                                |
+      | source  | core_user\reportbuilder\datasource\users |
+    And I log in as "admin"
+    When I navigate to "Reports > Report builder > Custom reports" in site administration
+    And I click on "Filters" "button"
+    And I set the following fields in the "Time created" "core_reportbuilder > Filter" to these values:
+      | Time created operator | Range          |
+      | Time created from     | ##2 days ago## |
+      | Time created to       | ##tomorrow##   |
+    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    Then I should see "Filters applied"
+    And I should see "My report" in the "Reports list" "table"
+    And I set the field "Time created to" in the "Time created" "core_reportbuilder > Filter" to "##yesterday##"
+    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    And I should see "Nothing to display"
+    And "Reports list" "table" should not exist
+
   Scenario: Custom report tags are not displayed if tagging is disabled
     Given the following config values are set as admin:
       | usetags | 0 |

From 49b4f795ecd64419525cd0fb5bb007cc2b62f93a Mon Sep 17 00:00:00 2001
From: Angelia Dela Cruz <andelacruz@ubiquitous-tech.com>
Date: Fri, 12 Jan 2024 17:05:52 +0800
Subject: [PATCH 55/75] MDL-80589 qtype_numerical: Behat to add, edit, preview
 numeric question

---
 .../type/numerical/tests/behat/add.feature    | 24 ++++++++++-
 .../type/numerical/tests/behat/edit.feature   | 29 +++++++++++++
 .../numerical/tests/behat/preview.feature     | 42 +++++++++++++++++++
 3 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/question/type/numerical/tests/behat/add.feature b/question/type/numerical/tests/behat/add.feature
index 6444da83c6aca..140b2d136658d 100644
--- a/question/type/numerical/tests/behat/add.feature
+++ b/question/type/numerical/tests/behat/add.feature
@@ -37,7 +37,7 @@ Feature: Test creating a Numerical question
     Then I should see "Numerical-001"
 
   @javascript
-  Scenario: Create a Numerical question with units
+  Scenario: Create a Numerical question with required units
     When I am on the "Course 1" "core_question > course question bank" page logged in as teacher
     And I add a "Numerical" question filling the form with:
       | Question name                      | Numerical-002                               |
@@ -70,3 +70,25 @@ Feature: Test creating a Numerical question
       | id_unitgradingtypes                | as a fraction (0-1) of the question grade   |
       | id_multichoicedisplay              | a drop-down menu                            |
       | id_unitsleft                       | on the right, for example 1.00cm or 1.00km  |
+
+  @javascript
+  Scenario: Create a Numerical question with optional units
+    When I am on the "Course 1" "core_question > course question bank" page logged in as teacher
+    # Add the numerical question with optional units.
+    And I add a "Numerical" question filling the form with:
+      | Question name    | Numerical Question 1                                                                                       |
+      | Question text    | What is the sum of $8 + $9? <img src="http://download.moodle.org/unittest/test.jpg"> |
+      | Default mark     | 1                                                                                                          |
+      | General feedback | The correct answer is $17 <img src="http://download.moodle.org/unittest/test.jpg">   |
+      | id_answer_0      | 17                                                                                                         |
+      | id_tolerance_0   | 0                                                                                                          |
+      | id_fraction_0    | 100%                                                                                                       |
+      | id_answer_1      | *                                                                                                         |
+      | id_tolerance_1   | 0                                                                                                          |
+      | id_fraction_1    | 0%                                                                                                         |
+      | id_unitrole      | Units are optional. If a unit is entered, it is used to convert the response to Unit 1 before grading.     |
+      | id_unitsleft     | on the left, for example $1.00 or £1.00                                                                    |
+      | id_unit_0        | $                                                                                                          |
+      | id_multiplier_0  | 1                                                                                                          |
+    # Confirm that the numerical question with optional units is added successfully.
+    Then I should see "Numerical Question 1"
diff --git a/question/type/numerical/tests/behat/edit.feature b/question/type/numerical/tests/behat/edit.feature
index a70da10c6ed0c..e1c97c18f1121 100644
--- a/question/type/numerical/tests/behat/edit.feature
+++ b/question/type/numerical/tests/behat/edit.feature
@@ -55,3 +55,32 @@ Feature: Test editing a Numerical question
     Then the following fields match these values:
       | id_answer_0    | 0.00000123456789 |
       | id_tolerance_1 | 0.0000123456789  |
+
+  Scenario: Edit a Numerical question with optional units
+    When I am on the "Numerical for editing" "core_question > edit" page logged in as teacher
+    # Edit the existing numerical question, add in the optional units.
+    And I set the following fields to these values:
+      | Question text    | What's $500 in Php? <img src="/lib/tests/fixtures/gd-logo.png" alt="aaa" width="100" height="75"/>            |
+      | Default mark     | 1                                                                                                             |
+      | General feedback | The correct answer is Php27950 <img src="/lib/tests/fixtures/gd-logo.png" alt="aaa" width="100" height="75"/> |
+      | id_unitrole      | Units are optional. If a unit is entered, it is used to convert the response to Unit 1 before grading.        |
+      | id_unitsleft     | on the left, for example $1.00 or £1.00                                                                       |
+      | id_answer_0      | 27950                                                                                                         |
+      | id_tolerance_0   | 0                                                                                                             |
+      | id_fraction_0    | 100%                                                                                                          |
+      | id_unit_0        | Php                                                                                                           |
+      | id_multiplier_0  | 55.9                                                                                                          |
+    And I press "submitbutton"
+    And I choose "Edit question" action for "Numerical for editing" in the question bank
+    # Confirm that the numerical question is updated accordingly.
+    Then the following fields match these values:
+      | Question text    | What's $500 in Php? <img src="/lib/tests/fixtures/gd-logo.png" alt="aaa" width="100" height="75"/>            |
+      | Default mark     | 1                                                                                                             |
+      | General feedback | The correct answer is Php27950 <img src="/lib/tests/fixtures/gd-logo.png" alt="aaa" width="100" height="75"/> |
+      | id_unitrole      | Units are optional. If a unit is entered, it is used to convert the response to Unit 1 before grading.        |
+      | id_unitsleft     | on the left, for example $1.00 or £1.00                                                                       |
+      | id_answer_0      | 27950                                                                                                         |
+      | id_tolerance_0   | 0                                                                                                             |
+      | id_fraction_0    | 100%                                                                                                          |
+      | id_unit_0        | Php                                                                                                           |
+      | id_multiplier_0  | 55.9                                                                                                          |
diff --git a/question/type/numerical/tests/behat/preview.feature b/question/type/numerical/tests/behat/preview.feature
index 6538a411284f0..02ca6393992d8 100644
--- a/question/type/numerical/tests/behat/preview.feature
+++ b/question/type/numerical/tests/behat/preview.feature
@@ -45,3 +45,45 @@ Feature: Preview a Numerical question
     And I press "Check"
     And I should see "Very good."
     And I should see "Mark 1#00 out of 1#00"
+
+  Scenario: Preview a Numerical question with optional units
+    Given I am on the "Course 1" "core_question > course question bank" page logged in as teacher
+    # Add the numerical question with optional units
+    And I add a "Numerical" question filling the form with:
+      | Question name    | Numerical 1                                                                                       |
+      | Question text    | What's $500 in Php? <img src="/lib/tests/fixtures/gd-logo.png" alt="img1" width="100" height="75"/> |
+      | Default mark     | 1                                                                                                          |
+      | General feedback | The correct answer is Php27950 <img src="/lib/tests/fixtures/gd-logo.png" alt="img1" width="100" height="75"/> |
+      | id_answer_0      | 27950                                                                                                      |
+      | id_tolerance_0   | 0                                                                                                          |
+      | id_fraction_0    | 100%                                                                                                       |
+      | id_feedback_0    | Correct!                                                                                                   |
+      | id_answer_1      | *                                                                                                         |
+      | id_tolerance_1   | 0                                                                                                          |
+      | id_fraction_1    | 0%                                                                                                         |
+      | id_feedback_1    | Wrong!                                                                                                     |
+      | id_unitrole      | Units are optional. If a unit is entered, it is used to convert the response to Unit 1 before grading.     |
+      | id_unitsleft     | on the left, for example $1.00 or £1.00                                                                    |
+      | id_unit_0        | Php                                                                                                        |
+      | id_multiplier_0  | 1                                                                                                          |
+    # Confirm numerical question can be previewed.
+    When I am on the "Numerical 1" "core_question > preview" page logged in as teacher
+    Then I should see "Numerical 1"
+    And I should see "What's $500 in Php?"
+    # Answer question correctly.
+    And I set the following fields to these values:
+      | Answer | 27950 |
+    And I press "Submit and finish"
+    # Confirm that corresponding feedback is displayed.
+    And I should see "The correct answer is Php27950"
+    And I should see "Correct!"
+    And "//img[contains(@src, 'gd-logo.png')]" "xpath_element" should exist
+    And I press "Start again"
+    # Answer question incorrectly.
+    And I set the following fields to these values:
+      | Answer | 27961 |
+    And I press "Submit and finish"
+    # Confirm that corresponding feedback is displayed.
+    And I should see "The correct answer is Php27950"
+    And I should see "Wrong!"
+    And "//img[contains(@src, 'gd-logo.png')]" "xpath_element" should exist

From 49212ac96c4805d9d4768677c7e10e0b3519180c Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Thu, 2 May 2024 12:28:25 +0800
Subject: [PATCH 56/75] MDL-80589 behat: fixes and improvements to new tests

---
 .../type/numerical/tests/behat/add.feature    | 40 +++++++------
 .../type/numerical/tests/behat/edit.feature   | 48 +++++++--------
 .../numerical/tests/behat/preview.feature     | 58 ++++++-------------
 3 files changed, 66 insertions(+), 80 deletions(-)

diff --git a/question/type/numerical/tests/behat/add.feature b/question/type/numerical/tests/behat/add.feature
index 140b2d136658d..5318ad02136ec 100644
--- a/question/type/numerical/tests/behat/add.feature
+++ b/question/type/numerical/tests/behat/add.feature
@@ -71,24 +71,30 @@ Feature: Test creating a Numerical question
       | id_multichoicedisplay              | a drop-down menu                            |
       | id_unitsleft                       | on the right, for example 1.00cm or 1.00km  |
 
-  @javascript
   Scenario: Create a Numerical question with optional units
-    When I am on the "Course 1" "core_question > course question bank" page logged in as teacher
+    Given I am on the "Course 1" "core_question > course question bank" page logged in as teacher
     # Add the numerical question with optional units.
     And I add a "Numerical" question filling the form with:
-      | Question name    | Numerical Question 1                                                                                       |
-      | Question text    | What is the sum of $8 + $9? <img src="http://download.moodle.org/unittest/test.jpg"> |
-      | Default mark     | 1                                                                                                          |
-      | General feedback | The correct answer is $17 <img src="http://download.moodle.org/unittest/test.jpg">   |
-      | id_answer_0      | 17                                                                                                         |
-      | id_tolerance_0   | 0                                                                                                          |
-      | id_fraction_0    | 100%                                                                                                       |
-      | id_answer_1      | *                                                                                                         |
-      | id_tolerance_1   | 0                                                                                                          |
-      | id_fraction_1    | 0%                                                                                                         |
-      | id_unitrole      | Units are optional. If a unit is entered, it is used to convert the response to Unit 1 before grading.     |
-      | id_unitsleft     | on the left, for example $1.00 or £1.00                                                                    |
-      | id_unit_0        | $                                                                                                          |
-      | id_multiplier_0  | 1                                                                                                          |
+      | Question name    | Numerical Question (optional)              |
+      | Question text    | How many meter is 1m + 20cm + 50mm?        |
+      | Default mark     | 1                                          |
+      | General feedback | The correct answer is 1.25m                |
+      | id_answer_0      | 1.25                                       |
+      | id_tolerance_0   | 0                                          |
+      | id_fraction_0    | 100%                                       |
+      | id_answer_1      | 125                                        |
+      | id_tolerance_1   | 0                                          |
+      | id_fraction_1    | 0%                                         |
+      | id_unitrole      | Units are optional.                        |
+      | id_unitsleft     | on the right, for example 1.00cm or 1.00km |
+      | id_unit_0        | m                                          |
     # Confirm that the numerical question with optional units is added successfully.
-    Then I should see "Numerical Question 1"
+    When I choose "Edit question" action for "Numerical Question (optional)" in the question bank
+    Then the following fields match these values:
+      | Question name    | Numerical Question (optional)                                                                          |
+      | Question text    | How many meter is 1m + 20cm + 50mm?                                                                    |
+      | Default mark     | 1                                                                                                      |
+      | General feedback | The correct answer is 1.25m                                                                            |
+      | id_unitrole      | Units are optional. If a unit is entered, it is used to convert the response to Unit 1 before grading. |
+      | id_unitsleft     | on the right, for example 1.00cm or 1.00km                                                             |
+      | id_unit_0        | m                                                                                                      |
diff --git a/question/type/numerical/tests/behat/edit.feature b/question/type/numerical/tests/behat/edit.feature
index e1c97c18f1121..63de4496cebb2 100644
--- a/question/type/numerical/tests/behat/edit.feature
+++ b/question/type/numerical/tests/behat/edit.feature
@@ -57,30 +57,30 @@ Feature: Test editing a Numerical question
       | id_tolerance_1 | 0.0000123456789  |
 
   Scenario: Edit a Numerical question with optional units
-    When I am on the "Numerical for editing" "core_question > edit" page logged in as teacher
-    # Edit the existing numerical question, add in the optional units.
+    Given I am on the "Numerical for editing" "core_question > edit" page logged in as teacher
+    # Edit the existing numerical question, changing the unit to optional.
     And I set the following fields to these values:
-      | Question text    | What's $500 in Php? <img src="/lib/tests/fixtures/gd-logo.png" alt="aaa" width="100" height="75"/>            |
-      | Default mark     | 1                                                                                                             |
-      | General feedback | The correct answer is Php27950 <img src="/lib/tests/fixtures/gd-logo.png" alt="aaa" width="100" height="75"/> |
-      | id_unitrole      | Units are optional. If a unit is entered, it is used to convert the response to Unit 1 before grading.        |
-      | id_unitsleft     | on the left, for example $1.00 or £1.00                                                                       |
-      | id_answer_0      | 27950                                                                                                         |
-      | id_tolerance_0   | 0                                                                                                             |
-      | id_fraction_0    | 100%                                                                                                          |
-      | id_unit_0        | Php                                                                                                           |
-      | id_multiplier_0  | 55.9                                                                                                          |
+      | Question name    | Numerical Question (optional)              |
+      | Question text    | How many meter is 1m + 20cm + 50mm?        |
+      | Default mark     | 1                                          |
+      | General feedback | The correct answer is 1.25m                |
+      | id_answer_0      | 1.25                                       |
+      | id_tolerance_0   | 0                                          |
+      | id_fraction_0    | 100%                                       |
+      | id_answer_1      | 125                                        |
+      | id_tolerance_1   | 0                                          |
+      | id_fraction_1    | 0%                                         |
+      | id_unitrole      | Units are optional.                        |
+      | id_unitsleft     | on the right, for example 1.00cm or 1.00km |
+      | id_unit_0        | m                                          |
     And I press "submitbutton"
-    And I choose "Edit question" action for "Numerical for editing" in the question bank
-    # Confirm that the numerical question is updated accordingly.
+    When I choose "Edit question" action for "Numerical Question (optional)" in the question bank
+    # Confirm that the numerical question with optional unit is updated accordingly.
     Then the following fields match these values:
-      | Question text    | What's $500 in Php? <img src="/lib/tests/fixtures/gd-logo.png" alt="aaa" width="100" height="75"/>            |
-      | Default mark     | 1                                                                                                             |
-      | General feedback | The correct answer is Php27950 <img src="/lib/tests/fixtures/gd-logo.png" alt="aaa" width="100" height="75"/> |
-      | id_unitrole      | Units are optional. If a unit is entered, it is used to convert the response to Unit 1 before grading.        |
-      | id_unitsleft     | on the left, for example $1.00 or £1.00                                                                       |
-      | id_answer_0      | 27950                                                                                                         |
-      | id_tolerance_0   | 0                                                                                                             |
-      | id_fraction_0    | 100%                                                                                                          |
-      | id_unit_0        | Php                                                                                                           |
-      | id_multiplier_0  | 55.9                                                                                                          |
+      | Question name    | Numerical Question (optional)                                                                          |
+      | Question text    | How many meter is 1m + 20cm + 50mm?                                                                    |
+      | Default mark     | 1                                                                                                      |
+      | General feedback | The correct answer is 1.25m                                                                            |
+      | id_unitrole      | Units are optional. If a unit is entered, it is used to convert the response to Unit 1 before grading. |
+      | id_unitsleft     | on the right, for example 1.00cm or 1.00km                                                             |
+      | id_unit_0        | m                                                                                                      |
diff --git a/question/type/numerical/tests/behat/preview.feature b/question/type/numerical/tests/behat/preview.feature
index 02ca6393992d8..445d8f0d6bf5c 100644
--- a/question/type/numerical/tests/behat/preview.feature
+++ b/question/type/numerical/tests/behat/preview.feature
@@ -47,43 +47,23 @@ Feature: Preview a Numerical question
     And I should see "Mark 1#00 out of 1#00"
 
   Scenario: Preview a Numerical question with optional units
-    Given I am on the "Course 1" "core_question > course question bank" page logged in as teacher
-    # Add the numerical question with optional units
-    And I add a "Numerical" question filling the form with:
-      | Question name    | Numerical 1                                                                                       |
-      | Question text    | What's $500 in Php? <img src="/lib/tests/fixtures/gd-logo.png" alt="img1" width="100" height="75"/> |
-      | Default mark     | 1                                                                                                          |
-      | General feedback | The correct answer is Php27950 <img src="/lib/tests/fixtures/gd-logo.png" alt="img1" width="100" height="75"/> |
-      | id_answer_0      | 27950                                                                                                      |
-      | id_tolerance_0   | 0                                                                                                          |
-      | id_fraction_0    | 100%                                                                                                       |
-      | id_feedback_0    | Correct!                                                                                                   |
-      | id_answer_1      | *                                                                                                         |
-      | id_tolerance_1   | 0                                                                                                          |
-      | id_fraction_1    | 0%                                                                                                         |
-      | id_feedback_1    | Wrong!                                                                                                     |
-      | id_unitrole      | Units are optional. If a unit is entered, it is used to convert the response to Unit 1 before grading.     |
-      | id_unitsleft     | on the left, for example $1.00 or £1.00                                                                    |
-      | id_unit_0        | Php                                                                                                        |
-      | id_multiplier_0  | 1                                                                                                          |
-    # Confirm numerical question can be previewed.
-    When I am on the "Numerical 1" "core_question > preview" page logged in as teacher
-    Then I should see "Numerical 1"
-    And I should see "What's $500 in Php?"
-    # Answer question correctly.
+    Given I am on the "Numerical-001" "core_question > edit" page logged in as teacher
+    # Edit the existing numerical question, add in the optional units.
     And I set the following fields to these values:
-      | Answer | 27950 |
-    And I press "Submit and finish"
-    # Confirm that corresponding feedback is displayed.
-    And I should see "The correct answer is Php27950"
-    And I should see "Correct!"
-    And "//img[contains(@src, 'gd-logo.png')]" "xpath_element" should exist
-    And I press "Start again"
-    # Answer question incorrectly.
-    And I set the following fields to these values:
-      | Answer | 27961 |
-    And I press "Submit and finish"
-    # Confirm that corresponding feedback is displayed.
-    And I should see "The correct answer is Php27950"
-    And I should see "Wrong!"
-    And "//img[contains(@src, 'gd-logo.png')]" "xpath_element" should exist
+      | Question name                      | Numerical Question (optional)              |
+      | Question text                      | How many meter is 1m + 20cm + 50mm?        |
+      | Default mark                       | 1                                          |
+      | General feedback                   | The correct answer is 1.25m                |
+      | id_answer_0                        | 1.25                                       |
+      | id_tolerance_0                     | 0                                          |
+      | id_fraction_0                      | 100%                                       |
+      | id_answer_1                        | 125                                        |
+      | id_tolerance_1                     | 0                                          |
+      | id_fraction_1                      | 0%                                         |
+      | id_unitrole                        | Units are optional.                        |
+      | id_unitsleft                       | on the right, for example 1.00cm or 1.00km |
+      | id_unit_0                          | m                                          |
+    And I press "submitbutton"
+    When I choose "Preview" action for "Numerical Question (optional)" in the question bank
+    # Unit is optional, so the unit select box should not be exist.
+    Then "Select one unit" "select" should not exist

From b7030c76c621bde0170c6d067b59fa457d00f462 Mon Sep 17 00:00:00 2001
From: Carlos Castillo <carlos.castillo@moodle.com>
Date: Thu, 2 May 2024 13:56:47 +0200
Subject: [PATCH 57/75] MDL-81764 reportbuilder: Include full name filter to
 Users system report

---
 .../local/systemreports/users.php             |  1 +
 admin/tests/behat/filter_users.feature        | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/admin/classes/reportbuilder/local/systemreports/users.php b/admin/classes/reportbuilder/local/systemreports/users.php
index f1dba3de83e4a..cbf9868f14521 100644
--- a/admin/classes/reportbuilder/local/systemreports/users.php
+++ b/admin/classes/reportbuilder/local/systemreports/users.php
@@ -184,6 +184,7 @@ protected function add_filters(): void {
         $entityuseralias = $entityuser->get_table_alias('user');
 
         $filters = [
+            'user:fullname',
             'user:firstname',
             'user:lastname',
             'user:username',
diff --git a/admin/tests/behat/filter_users.feature b/admin/tests/behat/filter_users.feature
index cb9bbf3525078..1b60d4edbbda2 100644
--- a/admin/tests/behat/filter_users.feature
+++ b/admin/tests/behat/filter_users.feature
@@ -159,3 +159,24 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
     And I should not see "User One" in the "reportbuilder-table" "table"
     And I should not see "User Three" in the "reportbuilder-table" "table"
     And I should not see "User Four" in the "reportbuilder-table" "table"
+
+  @javascript
+  Scenario: Filter users by full name
+    When I click on "Filters" "button"
+    And I set the following fields in the "Full name" "core_reportbuilder > Filter" to these values:
+      | Full name operator | Is equal to |
+      | Full name value    | User One    |
+    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    Then I should see "User One" in the "reportbuilder-table" "table"
+    And I should not see "User Two" in the "reportbuilder-table" "table"
+    And I should not see "User Three" in the "reportbuilder-table" "table"
+    And I should not see "User Four" in the "reportbuilder-table" "table"
+    And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
+    And I set the following fields in the "Full name" "core_reportbuilder > Filter" to these values:
+      | Full name operator | Is equal to |
+      | Full name value    | User Two    |
+    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    And I should see "User Two" in the "reportbuilder-table" "table"
+    And I should not see "User One" in the "reportbuilder-table" "table"
+    And I should not see "User Three" in the "reportbuilder-table" "table"
+    And I should not see "User Four" in the "reportbuilder-table" "table"

From b4eab698309794c13807c0af4c38c0d8eefe0c9e Mon Sep 17 00:00:00 2001
From: AMOS bot <amos@moodle.org>
Date: Fri, 3 May 2024 00:10:51 +0000
Subject: [PATCH 58/75] Automatically generated installer lang files

---
 install/lang/bg/error.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/install/lang/bg/error.php b/install/lang/bg/error.php
index 485dd25fe1028..bc1e612f32bec 100644
--- a/install/lang/bg/error.php
+++ b/install/lang/bg/error.php
@@ -39,4 +39,7 @@
 $string['cannotfindcomponent'] = 'Не можа да намери компонент';
 $string['cannotunzipfile'] = 'Файлът не може да се разархивира';
 $string['componentisuptodate'] = 'Компонентът е актуален';
-$string['remotedownloaderror'] = 'Изтеглянето на компонента към вашия сървър пропадна, проверете настройките на proxy, препоръчително е PHP разширението cURL.<br /><br />Вие трябва ръчно да изтеглите файла <a href="{$a->url}">{$a->url}</a>, да го копирате в директория {$a->dest} на вашия сървър и да го разархивирате там.';
+$string['remotedownloaderror'] = '<p>Изтеглянето на компонента към вашия сървър пропадна, проверете настройките на proxy; препоръчително е PHP разширението cURL.</p><p>Вие трябва ръчно да изтеглите файла <a href="{$a->url}">{$a->url}</a>, да го копирате в директория "{$a->dest}" на вашия сървър и да го разархивирате там.</p>';
+$string['wrongdestpath'] = 'Грешен път към целта';
+$string['wrongsourcebase'] = 'Грешен изходен адрес';
+$string['wrongzipfilename'] = 'Грешно име на ZIP файл-а';

From 67b2c43225285ddc63ee17fa05b03e4f339cf2af Mon Sep 17 00:00:00 2001
From: Ilya Tregubov <ilya.a.tregubov@gmail.com>
Date: Fri, 3 May 2024 08:22:25 +0800
Subject: [PATCH 59/75] weekly release 4.5dev

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index b0cc1eaf1ed0e..2513fe1f977b7 100644
--- a/version.php
+++ b/version.php
@@ -29,9 +29,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2024042200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2024050300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
-$release  = '4.5dev (Build: 20240425)'; // Human-friendly version name
+$release  = '4.5dev (Build: 20240503)'; // Human-friendly version name
 $branch   = '405';                     // This version's branch.
 $maturity = MATURITY_ALPHA;             // This version's maturity level.

From a64c23c045121642ed084d48782f97a87b84e4d8 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Wed, 3 Apr 2024 12:08:47 +0100
Subject: [PATCH 60/75] MDL-81423 assign: improve valdation message for
 submissionstatement

---
 mod/assign/lang/en/assign.php                       | 2 +-
 mod/assign/locallib.php                             | 3 ++-
 mod/assign/submissionconfirmform.php                | 3 ++-
 mod/assign/tests/behat/group_submission.feature     | 2 +-
 mod/assign/tests/behat/submission_statement.feature | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php
index 327d31a6197d5..8a384234f3f9a 100644
--- a/mod/assign/lang/en/assign.php
+++ b/mod/assign/lang/en/assign.php
@@ -574,9 +574,9 @@
 $string['submissionsclosed'] = 'Submissions closed';
 $string['submissionsettings'] = 'Submission settings';
 $string['submissionstatement'] = 'Submission statement';
-$string['submissionstatement_help'] = 'Assignment submission confirmation statement';
 $string['submissionstatementdefault'] = 'This submission is my own work, except where I have acknowledged the use of the works of other people.';
 $string['submissionstatement_help'] = 'Statement that each student must accept in order to submit their work.';
+$string['submissionstatementrequired'] = 'You are required to agree to this statement before you can submit.';
 $string['submissionstatementteamsubmission'] = 'Group submission statement';
 $string['submissionstatementteamsubmissiondefault'] = 'This submission is the work of my group, except where we have acknowledged the use of the works of other people.';
 $string['submissionstatementteamsubmission_help'] = 'Statement that each student must accept in order to submit the work of their group.';
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index cf80496e413ed..684da36963754 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -8147,7 +8147,8 @@ public function add_submission_form_elements(MoodleQuickForm $mform, stdClass $d
         // Only show submission statement if we are editing our own submission.
         if ($requiresubmissionstatement && !$draftsenabled && $userid == $USER->id) {
             $mform->addElement('checkbox', 'submissionstatement', '', $submissionstatement);
-            $mform->addRule('submissionstatement', get_string('required'), 'required', null, 'client');
+            $mform->addRule('submissionstatement', get_string('submissionstatementrequired', 'mod_assign'),
+                'required', null, 'client');
         }
 
         $this->add_plugin_submission_elements($submission, $mform, $data, $userid);
diff --git a/mod/assign/submissionconfirmform.php b/mod/assign/submissionconfirmform.php
index 1508026a8506e..b8c440c1b3436 100644
--- a/mod/assign/submissionconfirmform.php
+++ b/mod/assign/submissionconfirmform.php
@@ -48,7 +48,8 @@ public function definition() {
 
         if ($requiresubmissionstatement) {
             $mform->addElement('checkbox', 'submissionstatement', '', $submissionstatement);
-            $mform->addRule('submissionstatement', get_string('required'), 'required', null, 'client');
+            $mform->addRule('submissionstatement', get_string('submissionstatementrequired', 'mod_assign'),
+                'required', null, 'client');
         }
 
         $mform->addElement('static', 'confirmmessage', '', get_string('confirmsubmission', 'mod_assign'));
diff --git a/mod/assign/tests/behat/group_submission.feature b/mod/assign/tests/behat/group_submission.feature
index 92483c3570afa..2376fc0defcfa 100644
--- a/mod/assign/tests/behat/group_submission.feature
+++ b/mod/assign/tests/behat/group_submission.feature
@@ -58,7 +58,7 @@ Feature: Group assignment submissions
     And I should see "This submission is the work of my group, except where we have acknowledged the use of the works of other people."
     And I press "Continue"
     And I should see "Confirm submission"
-    And I should see "- Required"
+    And I should see "You are required to agree to this statement before you can submit."
     And I set the field "submissionstatement" to "1"
     And I press "Continue"
     And I should see "Submitted for grading" in the "Submission status" "table_row"
diff --git a/mod/assign/tests/behat/submission_statement.feature b/mod/assign/tests/behat/submission_statement.feature
index ddce1a10c2f42..2f4e006951833 100644
--- a/mod/assign/tests/behat/submission_statement.feature
+++ b/mod/assign/tests/behat/submission_statement.feature
@@ -34,7 +34,7 @@ Feature: In an assignment, teacher can require submission statements
     Then I should see "This submission is my own work, except where I have acknowledged the use of the works of other people."
     And I press "Continue"
     And I should see "Confirm submission"
-    And I should see "- Required"
+    And I should see "You are required to agree to this statement before you can submit."
     And I set the field "submissionstatement" to "1"
     And I press "Continue"
     And I should see "Submitted for grading" in the "Submission status" "table_row"

From 45b43d137f80fa4c1303f2757a42a4741e9cafd1 Mon Sep 17 00:00:00 2001
From: David Carrillo <davidmc@moodle.com>
Date: Fri, 3 May 2024 11:40:35 +0200
Subject: [PATCH 61/75] MDL-81776 reportbuilder: Check tagarea enabled when
 check availability

- When checking availability for a column/filter we need to assert
tagarea is enabled because it can return also null value.
---
 reportbuilder/classes/local/systemreports/reports_list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reportbuilder/classes/local/systemreports/reports_list.php b/reportbuilder/classes/local/systemreports/reports_list.php
index ba726e7180166..da80e6f62b5c7 100644
--- a/reportbuilder/classes/local/systemreports/reports_list.php
+++ b/reportbuilder/classes/local/systemreports/reports_list.php
@@ -181,7 +181,7 @@ protected function add_columns(): void {
                    AND ti.itemid = {$tablealias}.id
             )", 'tags')
             ->set_is_sortable(true)
-            ->set_is_available(core_tag_tag::is_enabled('core_reportbuilder', 'reportbuilder_report'))
+            ->set_is_available(core_tag_tag::is_enabled('core_reportbuilder', 'reportbuilder_report') === true)
             ->add_callback(static function(?string $tags): string {
                 return implode(', ', array_map(static function(string $tag): string {
                     [$name, $rawname] = explode('|', $tag);
@@ -265,7 +265,7 @@ protected function add_filters(): void {
                 'component' => 'core_reportbuilder',
                 'itemtype' => 'reportbuilder_report',
             ])
-            ->set_is_available(core_tag_tag::is_enabled('core_reportbuilder', 'reportbuilder_report'))
+            ->set_is_available(core_tag_tag::is_enabled('core_reportbuilder', 'reportbuilder_report') === true)
         );
 
         // Time created filter.

From 781694d2f895904ed15318edc7d775e09d0c6c01 Mon Sep 17 00:00:00 2001
From: Daniel Ziegenberg <daniel@ziegenberg.at>
Date: Fri, 22 Mar 2024 15:33:05 +0100
Subject: [PATCH 62/75] MDL-71748 core: final removal of
 core_text::reset_caches()

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
---
 lib/classes/text.php | 14 +++++++++-----
 lib/upgrade.txt      |  4 ++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/classes/text.php b/lib/classes/text.php
index b3b3164fc3f6e..f72b310541957 100644
--- a/lib/classes/text.php
+++ b/lib/classes/text.php
@@ -75,13 +75,17 @@ public static function is_charset_supported(string $charset): bool {
     }
 
     /**
-     * Reset internal textlib caches.
-     * @static
      * @deprecated since Moodle 4.0. See MDL-53544.
-     * @todo To be removed in Moodle 4.4 - MDL-71748
      */
-    public static function reset_caches() {
-        debugging("reset_caches() is deprecated. Typo3 has been removed and caches aren't used anymore.", DEBUG_DEVELOPER);
+    #[\core\attribute\deprecated(
+        'core_text::reset_caches',
+        since: '4.0',
+        reason:'Typo3 has been removed and caches aren\'t used anymore.',
+        mdl: 'MDL-53544',
+        final: true,
+    )]
+    public static function reset_caches(): void {
+        \core\deprecation::emit_deprecation_if_present([self::class, __FUNCTION__]);
     }
 
     /**
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 49ec5e12f8e23..aa61077b8f722 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -1,6 +1,10 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
+=== 4.5 ===
+
+* Final deprecation and removal of the function core_text::reset_caches().
+
 === 4.4 ===
 
 * New modinfo methods related to delegated sections (sections controlled by a component):

From 9ab79e2822a6871e1cea18e755924d218a8542fd Mon Sep 17 00:00:00 2001
From: Angelia Dela Cruz <andelacruz@ubiquitous-tech.com>
Date: Wed, 18 Oct 2023 10:27:51 +0800
Subject: [PATCH 63/75] MDL-79702 core_tag: Behat for activity tags deletion
 during course reset

---
 .../behat/activity_tags_deletion.feature      | 121 ++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 course/tests/behat/activity_tags_deletion.feature

diff --git a/course/tests/behat/activity_tags_deletion.feature b/course/tests/behat/activity_tags_deletion.feature
new file mode 100644
index 0000000000000..e89e3f81aa220
--- /dev/null
+++ b/course/tests/behat/activity_tags_deletion.feature
@@ -0,0 +1,121 @@
+@core @core_course @core_tag @javascript
+Feature: Delete activity tags during course reset
+  As an admin,
+  I should be able to delete activity tags by performing course reset
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "activities" exist:
+      | activity | name          | course |
+      | book     | Test Book     | C1     |
+      | forum    | Test Forum    | C1     |
+      | glossary | Test Glossary | C1     |
+
+  Scenario: Delete book chapter tags using course reset
+    # Added multiple tags to confirm that all tags are deleted on course reset.
+    Given the following "mod_book > chapters" exist:
+      | book      | title     | content           | tags                  |
+      | Test Book | Chapter 1 | Chapter 1 content | SampleTag, ChapterTag |
+    # Perform course reset without checking anything.
+    And I log in as "admin"
+    And I am on the "Course 1" "reset" page
+    And I press "Reset"
+    And I press "Continue"
+    # Confirm that book chapter tags are not deleted.
+    When I am on the "Test Book" "book activity" page
+    Then I should see "SampleTag"
+    And I should see "ChapterTag"
+    # Delete book chapter tags using course reset.
+    And I am on the "Course 1" "reset" page
+    And I expand all fieldsets
+    And I click on "Remove all book tags" "checkbox"
+    And I press "Reset"
+    # Confirm that book chapter tags are sucessfully deleted.
+    And I should see "Book tags have been deleted" in the "Books" "table_row"
+    And I press "Continue"
+    And I am on the "Test Book" "book activity" page
+    And I should not see "SampleTag"
+    And I should not see "ChapterTag"
+
+  Scenario Outline: Delete forum discussion tags using course reset
+    Given the following "mod_forum > discussions" exist:
+      | user  | forum      | name         | message              |
+      | admin | Test Forum | Discussion 1 | Discussion 1 message |
+    # Added multiple tags to confirm that all tags are deleted on course reset.
+    And I am on the "Test Forum" "forum activity" page logged in as admin
+    And I follow "Discussion 1"
+    And I click on "Edit" "link"
+    And I set the following fields to these values:
+      | Tags | SampleTag, DiscussionTag |
+    And I press "Save changes"
+    # Perform course reset without checking anything.
+    And I am on the "Course 1" "reset" page
+    And I press "Reset"
+    And I press "Continue"
+    # Confirm that forum discussion tags are not deleted.
+    When I am on the "Test Forum" "forum activity" page
+    And I follow "Discussion 1"
+    Then I should see "SampleTag"
+    And I should see "DiscussionTag"
+    And I am on the "Course 1" "reset" page
+    And I expand all fieldsets
+    # Depending on <resetcheck> value, either delete all discussion posts or remove all forum discussion tags only.
+    And I click on "<resetcheck>" "checkbox"
+    # Confirm `Remove all forum tags` is disabled when `Delete all posts` on previous step is checked.
+    And the "Remove all forum tags" "checkbox" should be <canbechecked>
+    And I press "Reset"
+    And I should see "<resetmessage>" in the "Forums" "table_row"
+    And I press "Continue"
+    And I am on the "Test Forum" "forum activity" page
+    # Confirm discussion is deleted when `Delete all posts` was checked.
+    And I <forumview> see "There are no discussion topics yet in this forum"
+    # Confirm all discussion tags are deleted.
+    And I should not see "SampleTag"
+    And I should not see "DiscussionTag"
+
+    Examples:
+      | resetcheck            | resetmessage                 | canbechecked | forumview  |
+      | Delete all posts      | Delete all posts             | disabled     | should     |
+      | Remove all forum tags | Forum tags have been deleted | enabled      | should not |
+
+  Scenario Outline: Delete glossary entry tags using course reuse
+    Given the following "mod_glossary > entries" exist:
+      | glossary      | concept   | definition      | user  |
+      | Test Glossary | Aubergine | Also eggpgplant | admin |
+    # Added multiple tags to confirm that all tags are deleted on course reset.
+    And I am on the "Test Glossary" "glossary activity" page logged in as admin
+    And I click on "Edit entry: Aubergine" "link"
+    And I expand all fieldsets
+    And I set the following fields to these values:
+      | Tags | SampleTag, GlossaryTag |
+    And I press "Save changes"
+    # Perform course reset without checking anything.
+    And I am on the "Course 1" "reset" page
+    And I press "Reset"
+    And I press "Continue"
+    # Confirm that glossary entry tags are not deleted.
+    When I am on the "Test Glossary" "glossary activity" page
+    Then I should see "SampleTag"
+    And I should see "GlossaryTag"
+    And I am on the "Course 1" "reset" page
+    And I expand all fieldsets
+    # Depending on <resetcheck> value, either delete all glossary entries or remove all glossary entry tags only.
+    And I click on "<resetcheck>" "checkbox"
+    # Confirm `Remove all forum tags` is disabled when `Delete entries from all glossaries` on previous step is checked.
+    And the "Remove all glossary tags" "checkbox" should be <canbechecked>
+    And I press "Reset"
+    And I should see "<resetmessage>" in the "Glossaries" "table_row"
+    And I press "Continue"
+    And I am on the "Test Glossary" "glossary activity" page
+    # Confirm glossary entries are deleted when `Delete entries from all glossaries` is checked.
+    And I <glossaryview> see "No entries found in this section"
+    # Confirm that glossary entry tags are deleted.
+    And I should not see "SampleTag"
+    And I should not see "GlossaryTag"
+
+    Examples:
+      | resetcheck                         | resetmessage                       | canbechecked | glossaryview |
+      | Delete entries from all glossaries | Delete entries from all glossaries | disabled     | should       |
+      | Remove all glossary tags           | Glossary tags have been deleted    | enabled      | should not   |

From 7b713435b05449d5ee03b4401477cce2c0db0817 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Mon, 6 May 2024 16:39:44 +0800
Subject: [PATCH 64/75] MDL-79702 behat: improvements and fixes to new tests

This commit adds the handling of tags as string separated by comma
to forum and glossary modules.
---
 .../behat/activity_tags_deletion.feature      | 41 +++++++------------
 mod/forum/lib.php                             |  5 ++-
 mod/glossary/tests/generator/lib.php          | 12 +++++-
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/course/tests/behat/activity_tags_deletion.feature b/course/tests/behat/activity_tags_deletion.feature
index e89e3f81aa220..3d829af588403 100644
--- a/course/tests/behat/activity_tags_deletion.feature
+++ b/course/tests/behat/activity_tags_deletion.feature
@@ -1,4 +1,4 @@
-@core @core_course @core_tag @javascript
+@core @core_course @core_tag
 Feature: Delete activity tags during course reset
   As an admin,
   I should be able to delete activity tags by performing course reset
@@ -8,11 +8,12 @@ Feature: Delete activity tags during course reset
       | fullname | shortname |
       | Course 1 | C1        |
     And the following "activities" exist:
-      | activity | name          | course |
-      | book     | Test Book     | C1     |
-      | forum    | Test Forum    | C1     |
-      | glossary | Test Glossary | C1     |
+      | activity | name          | course | idnumber  |
+      | book     | Test Book     | C1     | book1     |
+      | forum    | Test Forum    | C1     | forum1    |
+      | glossary | Test Glossary | C1     | glossary1 |
 
+  @javascript
   Scenario: Delete book chapter tags using course reset
     # Added multiple tags to confirm that all tags are deleted on course reset.
     Given the following "mod_book > chapters" exist:
@@ -32,26 +33,20 @@ Feature: Delete activity tags during course reset
     And I expand all fieldsets
     And I click on "Remove all book tags" "checkbox"
     And I press "Reset"
-    # Confirm that book chapter tags are sucessfully deleted.
+    # Confirm that book chapter tags are deleted.
     And I should see "Book tags have been deleted" in the "Books" "table_row"
     And I press "Continue"
     And I am on the "Test Book" "book activity" page
     And I should not see "SampleTag"
     And I should not see "ChapterTag"
 
+  @javascript
   Scenario Outline: Delete forum discussion tags using course reset
     Given the following "mod_forum > discussions" exist:
-      | user  | forum      | name         | message              |
-      | admin | Test Forum | Discussion 1 | Discussion 1 message |
-    # Added multiple tags to confirm that all tags are deleted on course reset.
-    And I am on the "Test Forum" "forum activity" page logged in as admin
-    And I follow "Discussion 1"
-    And I click on "Edit" "link"
-    And I set the following fields to these values:
-      | Tags | SampleTag, DiscussionTag |
-    And I press "Save changes"
+      | user  | forum  | name         | message              | tags                     |
+      | admin | forum1 | Discussion 1 | Discussion 1 message | SampleTag, DiscussionTag |
     # Perform course reset without checking anything.
-    And I am on the "Course 1" "reset" page
+    And I am on the "Course 1" "reset" page logged in as admin
     And I press "Reset"
     And I press "Continue"
     # Confirm that forum discussion tags are not deleted.
@@ -80,19 +75,13 @@ Feature: Delete activity tags during course reset
       | Delete all posts      | Delete all posts             | disabled     | should     |
       | Remove all forum tags | Forum tags have been deleted | enabled      | should not |
 
+  @javascript
   Scenario Outline: Delete glossary entry tags using course reuse
     Given the following "mod_glossary > entries" exist:
-      | glossary      | concept   | definition      | user  |
-      | Test Glossary | Aubergine | Also eggpgplant | admin |
-    # Added multiple tags to confirm that all tags are deleted on course reset.
-    And I am on the "Test Glossary" "glossary activity" page logged in as admin
-    And I click on "Edit entry: Aubergine" "link"
-    And I expand all fieldsets
-    And I set the following fields to these values:
-      | Tags | SampleTag, GlossaryTag |
-    And I press "Save changes"
+      | glossary      | concept   | definition      | user  | tags                   |
+      | Test Glossary | Aubergine | Also eggpgplant | admin | SampleTag, GlossaryTag |
     # Perform course reset without checking anything.
-    And I am on the "Course 1" "reset" page
+    And I am on the "Course 1" "reset" page logged in as admin
     And I press "Reset"
     And I press "Continue"
     # Confirm that glossary entry tags are not deleted.
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index f8746ba995f38..77c61cdd0e22e 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -3107,7 +3107,10 @@ function forum_add_discussion($discussion, $mform=null, $unused=null, $userid=nu
     }
 
     if (isset($discussion->tags)) {
-        core_tag_tag::set_item_tags('mod_forum', 'forum_posts', $post->id, context_module::instance($cm->id), $discussion->tags);
+        $tags = is_array($discussion->tags) ? $discussion->tags : explode(',', $discussion->tags);
+
+        core_tag_tag::set_item_tags('mod_forum', 'forum_posts', $post->id,
+            context_module::instance($cm->id), $tags);
     }
 
     if (forum_tp_can_track_forums($forum) && forum_tp_is_tracked($forum)) {
diff --git a/mod/glossary/tests/generator/lib.php b/mod/glossary/tests/generator/lib.php
index 56debf62ccaeb..67a3be40ebbc5 100644
--- a/mod/glossary/tests/generator/lib.php
+++ b/mod/glossary/tests/generator/lib.php
@@ -188,6 +188,16 @@ public function create_entry(array $data): stdClass {
             $DB->insert_record('glossary_entries_categories', ['entryid' => $id, 'categoryid' => $categoryid]);
         }
 
-        return $DB->get_record('glossary_entries', array('id' => $id), '*', MUST_EXIST);
+        $entries =  $DB->get_record('glossary_entries', ['id' => $id], '*', MUST_EXIST);
+
+        if (isset($record['tags'])) {
+            $cm = get_coursemodule_from_instance('glossary', $glossary->id);
+            $tags = is_array($record['tags']) ? $record['tags'] : explode(',', $record['tags']);
+
+            core_tag_tag::set_item_tags('mod_glossary', 'glossary_entries', $id,
+                context_module::instance($cm->id), $tags);
+        }
+
+        return $entries;
     }
 }

From be7802fa885422b093bf6b5bd7aa5bd82cbf12a0 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 4 Mar 2024 18:49:29 +0000
Subject: [PATCH 65/75] MDL-72353 report: final removal of deprecated report
 selection method.

---
 lib/classes/report_helper.php    | 31 ++-----------
 lib/tests/report_helper_test.php | 78 --------------------------------
 report/upgrade.txt               |  4 ++
 3 files changed, 9 insertions(+), 104 deletions(-)
 delete mode 100644 lib/tests/report_helper_test.php

diff --git a/lib/classes/report_helper.php b/lib/classes/report_helper.php
index 05a0b26a9a544..3d1715edc9648 100644
--- a/lib/classes/report_helper.php
+++ b/lib/classes/report_helper.php
@@ -14,24 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Report plugins helper class
- *
- * @package core
- * @subpackage report
- * @copyright 2021 Sujith Haridasan
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core;
+
 use context_course;
-use moodle_url;
 use stdClass;
 
 /**
  * A helper class with static methods to help report plugins
  *
  * @package core
+ * @subpackage report
  * @copyright 2021 Sujith Haridasan
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -93,24 +85,11 @@ public static function print_report_selector(string $pluginname): void {
     }
 
     /**
-     * Save the last selected report in the session
-     *
      * @deprecated since Moodle 4.0
-     * @param int $id The course id
-     * @param moodle_url $url The moodle url
-     * @return void
      */
-    public static function save_selected_report(int $id, moodle_url $url): void {
-        global $USER;
-
-        debugging('save_selected_report() has been deprecated because it is no longer used and will be '.
-            'removed in future versions of Moodle', DEBUG_DEVELOPER);
-
-        // Last selected report.
-        if (!isset($USER->course_last_report)) {
-            $USER->course_last_report = [];
-        }
-        $USER->course_last_report[$id] = $url;
+    #[\core\attribute\deprecated(null, reason: 'It is no longer used', since: '4.0', final: true)]
+    public static function save_selected_report() {
+        \core\deprecation::emit_deprecation_if_present([self::class, __FUNCTION__]);
     }
 
     /**
diff --git a/lib/tests/report_helper_test.php b/lib/tests/report_helper_test.php
deleted file mode 100644
index f6cab8c765506..0000000000000
--- a/lib/tests/report_helper_test.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Tests for report_helper.
- *
- * @package    core
- * @category   test
- * @copyright  2021 Sujith Haridasan
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core;
-
-use moodle_url;
-use core\report_helper;
-
-/**
- * Tests the functions for report_helper class.
- */
-class report_helper_test extends \advanced_testcase {
-    /**
-     * Data provider for testing selected report for same and different courses
-     *
-     * @return array
-     */
-    public function data_selected_report(): array {
-        return [
-            ['course_url_id' => [
-                ['url' => '/test', 'id' => 1],
-                ['url' => '/foo', 'id' => 1]]
-            ],
-            ['course_url_id' => [
-                ['url' => '/test', 'id' => 1],
-                ['url' => '/foo/bar', 'id' => 2]]
-            ]
-        ];
-    }
-
-    /**
-     * Testing selected report saved in $USER session.
-     *
-     * @dataProvider data_selected_report
-     * @param array $courseurlid The array has both course url and course id
-     */
-    public function test_save_selected_report(array $courseurlid): void {
-        global $USER;
-
-        $url1 = new moodle_url($courseurlid[0]['url']);
-        $courseid1 = $courseurlid[0]['id'];
-        report_helper::save_selected_report($courseid1, $url1);
-        $this->assertDebuggingCalled('save_selected_report() has been deprecated because it is no ' .
-            'longer used and will be removed in future versions of Moodle');
-
-        $this->assertEquals($USER->course_last_report[$courseid1], $url1);
-
-        $url2 = new moodle_url($courseurlid[1]['url']);
-        $courseid2 = $courseurlid[1]['id'];
-        report_helper::save_selected_report($courseid2, $url2);
-        $this->assertDebuggingCalled('save_selected_report() has been deprecated because it is no ' .
-            'longer used and will be removed in future versions of Moodle');
-
-        $this->assertEquals($USER->course_last_report[$courseid2], $url2);
-    }
-}
diff --git a/report/upgrade.txt b/report/upgrade.txt
index 824ae418abac9..412e8e8449606 100644
--- a/report/upgrade.txt
+++ b/report/upgrade.txt
@@ -1,6 +1,10 @@
 This files describes API changes in /report/* - plugins,
 information provided here is intended especially for developers.
 
+=== 4.5 ===
+
+* The previously deprecated `report_helper::save_selected_report` method has been removed
+
 === 4.2 ===
 
 * The method report_progress\local\helper::get_activities_to_show() has an additional parameter $activitysection

From 81d2800a551e6227cacaefd18b804c4a456c4980 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 7 Mar 2024 17:47:35 +0000
Subject: [PATCH 66/75] MDL-73165 output: final removal of deprecated display
 logo method.

---
 lib/outputrenderers.php | 19 +++----------------
 lib/upgrade.txt         |  5 +++++
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index eadf44544d369..d4edea5323141 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -421,25 +421,12 @@ public function should_display_navbar_logo() {
     }
 
     /**
-     * Whether we should display the main logo.
      * @deprecated since Moodle 4.0
-     * @todo final deprecation. To be removed in Moodle 4.4 MDL-73165.
-     * @param int $headinglevel The heading level we want to check against.
-     * @return bool
      */
-    public function should_display_main_logo($headinglevel = 1) {
-        debugging('should_display_main_logo() is deprecated and will be removed in Moodle 4.4.', DEBUG_DEVELOPER);
-        // Only render the logo if we're on the front page or login page and the we have a logo.
-        $logo = $this->get_logo_url();
-        if ($headinglevel == 1 && !empty($logo)) {
-            if ($this->page->pagelayout == 'frontpage' || $this->page->pagelayout == 'login') {
-                return true;
-            }
-        }
-
-        return false;
+    #[\core\attribute\deprecated(null, reason: 'It is no longer used', since: '4.0', final: true)]
+    public function should_display_main_logo() {
+        \core\deprecation::emit_deprecation_if_present([self::class, __FUNCTION__]);
     }
-
 }
 
 
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 49ec5e12f8e23..a89a0ac41b1d6 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -1,6 +1,11 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
+=== 4.5 ===
+
+ * The following previously deprecated methods have been removed and can no longer be used:
+  - `renderer_base::should_display_main_logo`
+
 === 4.4 ===
 
 * New modinfo methods related to delegated sections (sections controlled by a component):

From bb93bcdb2d0f0b2d1ea48e37952e65365282addf Mon Sep 17 00:00:00 2001
From: Amaia Anabitarte <amaia@moodle.com>
Date: Tue, 30 Apr 2024 17:34:28 +0200
Subject: [PATCH 67/75] MDL-81601 core_course: Fix course index completion
 status

---
 .../tests/behat/enable_completion_on_pass_grade.feature      | 2 ++
 course/format/amd/build/local/courseeditor/exporter.min.js   | 2 +-
 .../format/amd/build/local/courseeditor/exporter.min.js.map  | 2 +-
 course/format/amd/src/local/courseeditor/exporter.js         | 5 ++++-
 course/format/classes/output/local/state/cm.php              | 5 +++--
 course/format/tests/behat/courseindex_completion.feature     | 4 ++--
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/completion/tests/behat/enable_completion_on_pass_grade.feature b/completion/tests/behat/enable_completion_on_pass_grade.feature
index cb8b1b182aedd..65dbced9ce1c4 100644
--- a/completion/tests/behat/enable_completion_on_pass_grade.feature
+++ b/completion/tests/behat/enable_completion_on_pass_grade.feature
@@ -39,6 +39,8 @@ Feature: Students will be marked as completed if they have achieved a passing gr
     When I am on the "Course 1" course page logged in as student1
     Then the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
     And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "failed"
+    And "Failed" "icon" should exist in the "courseindex-content" "region"
     And I am on the "Course 1" course page logged in as student2
     And the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
     And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "done"
+    And "Done" "icon" should exist in the "courseindex-content" "region"
diff --git a/course/format/amd/build/local/courseeditor/exporter.min.js b/course/format/amd/build/local/courseeditor/exporter.min.js
index 3ed55d17121ab..7ccd06eede53f 100644
--- a/course/format/amd/build/local/courseeditor/exporter.min.js
+++ b/course/format/amd/build/local/courseeditor/exporter.min.js
@@ -8,6 +8,6 @@ define("core_courseformat/local/courseeditor/exporter",["exports"],(function(_ex
    * @copyright  2021 Ferran Recio <ferran@moodle.com>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
    */
-class{constructor(reactive){this.reactive=reactive,this.COMPLETIONS=["incomplete","complete","complete","fail"]}course(state){var _state$course$highlig;const data={sections:[],editmode:this.reactive.isEditing,highlighted:null!==(_state$course$highlig=state.course.highlighted)&&void 0!==_state$course$highlig?_state$course$highlig:""};return this.listedSectionIds(state).forEach((sectionid=>{var _state$section$get;const sectioninfo=null!==(_state$section$get=state.section.get(sectionid))&&void 0!==_state$section$get?_state$section$get:{},section=this.section(state,sectioninfo);data.sections.push(section)})),data.hassections=0!=data.sections.length,data}listedSectionIds(state){var _state$course$section;return(null!==(_state$course$section=state.course.sectionlist)&&void 0!==_state$course$section?_state$course$section:[]).filter((sectionid=>{var _state$section$get2;return null===(null!==(_state$section$get2=state.section.get(sectionid))&&void 0!==_state$section$get2?_state$section$get2:{}).component}))}section(state,sectioninfo){var _state$course$highlig2,_sectioninfo$cmlist;const section={...sectioninfo,highlighted:null!==(_state$course$highlig2=state.course.highlighted)&&void 0!==_state$course$highlig2?_state$course$highlig2:"",cms:[]};return(null!==(_sectioninfo$cmlist=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist?_sectioninfo$cmlist:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid),cm=this.cm(state,cminfo);section.cms.push(cm)})),section.hascms=0!=section.cms.length,section}cm(state,cminfo){return{...cminfo,isactive:!1}}cmDraggableData(state,cmid){const cminfo=state.cm.get(cmid);if(!cminfo)return null;let nextcmid;const section=state.section.get(cminfo.sectionid),currentindex=null==section?void 0:section.cmlist.indexOf(cminfo.id);return void 0!==currentindex&&(nextcmid=null==section?void 0:section.cmlist[currentindex+1]),{type:"cm",id:cminfo.id,name:cminfo.name,sectionid:cminfo.sectionid,delegatesection:cminfo.delegatesection,nextcmid:nextcmid}}sectionDraggableData(state,sectionid){const sectioninfo=state.section.get(sectionid);return sectioninfo?{type:"section",id:sectioninfo.id,name:sectioninfo.name,number:sectioninfo.number}:null}fileDraggableData(state,dataTransfer){var _dataTransfer$files;const files=[];return(null===(_dataTransfer$files=dataTransfer.files)||void 0===_dataTransfer$files?void 0:_dataTransfer$files.length)>0&&dataTransfer.files.forEach((file=>{files.push(file)})),{type:"files",files:files}}cmCompletion(state,cminfo){const data={statename:"",state:"NaN"};if(void 0!==cminfo.completionstate){var _this$COMPLETIONS$cmi;data.state=cminfo.completionstate,data.hasstate=!0;const statename=null!==(_this$COMPLETIONS$cmi=this.COMPLETIONS[cminfo.completionstate])&&void 0!==_this$COMPLETIONS$cmi?_this$COMPLETIONS$cmi:"NaN";data["is".concat(statename)]=!0}return data}allItemsArray(state){var _state$course$section2;const items=[];return(null!==(_state$course$section2=state.course.sectionlist)&&void 0!==_state$course$section2?_state$course$section2:[]).forEach((sectionid=>{var _sectioninfo$cmlist2;const sectioninfo=state.section.get(sectionid);items.push({type:"section",id:sectioninfo.id,url:sectioninfo.sectionurl});(null!==(_sectioninfo$cmlist2=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist2?_sectioninfo$cmlist2:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid);items.push({type:"cm",id:cminfo.id,url:cminfo.url})}))})),items}canUseStealth(state,cmIds){return cmIds.some((cmId=>{var _cminfo$allowstealth;const cminfo=state.cm.get(cmId);return null!==(_cminfo$allowstealth=null==cminfo?void 0:cminfo.allowstealth)&&void 0!==_cminfo$allowstealth&&_cminfo$allowstealth}))}},_exports.default}));
+class{constructor(reactive){this.reactive=reactive,this.COMPLETIONS=["incomplete","complete","complete","fail"]}course(state){var _state$course$highlig;const data={sections:[],editmode:this.reactive.isEditing,highlighted:null!==(_state$course$highlig=state.course.highlighted)&&void 0!==_state$course$highlig?_state$course$highlig:""};return this.listedSectionIds(state).forEach((sectionid=>{var _state$section$get;const sectioninfo=null!==(_state$section$get=state.section.get(sectionid))&&void 0!==_state$section$get?_state$section$get:{},section=this.section(state,sectioninfo);data.sections.push(section)})),data.hassections=0!=data.sections.length,data}listedSectionIds(state){var _state$course$section;return(null!==(_state$course$section=state.course.sectionlist)&&void 0!==_state$course$section?_state$course$section:[]).filter((sectionid=>{var _state$section$get2;return null===(null!==(_state$section$get2=state.section.get(sectionid))&&void 0!==_state$section$get2?_state$section$get2:{}).component}))}section(state,sectioninfo){var _state$course$highlig2,_sectioninfo$cmlist;const section={...sectioninfo,highlighted:null!==(_state$course$highlig2=state.course.highlighted)&&void 0!==_state$course$highlig2?_state$course$highlig2:"",cms:[]};return(null!==(_sectioninfo$cmlist=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist?_sectioninfo$cmlist:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid),cm=this.cm(state,cminfo);section.cms.push(cm)})),section.hascms=0!=section.cms.length,section}cm(state,cminfo){return{...cminfo,isactive:!1}}cmDraggableData(state,cmid){const cminfo=state.cm.get(cmid);if(!cminfo)return null;let nextcmid;const section=state.section.get(cminfo.sectionid),currentindex=null==section?void 0:section.cmlist.indexOf(cminfo.id);return void 0!==currentindex&&(nextcmid=null==section?void 0:section.cmlist[currentindex+1]),{type:"cm",id:cminfo.id,name:cminfo.name,sectionid:cminfo.sectionid,delegatesection:cminfo.delegatesection,nextcmid:nextcmid}}sectionDraggableData(state,sectionid){const sectioninfo=state.section.get(sectionid);return sectioninfo?{type:"section",id:sectioninfo.id,name:sectioninfo.name,number:sectioninfo.number}:null}fileDraggableData(state,dataTransfer){var _dataTransfer$files;const files=[];return(null===(_dataTransfer$files=dataTransfer.files)||void 0===_dataTransfer$files?void 0:_dataTransfer$files.length)>0&&dataTransfer.files.forEach((file=>{files.push(file)})),{type:"files",files:files}}cmCompletion(state,cminfo){const data={statename:"",state:"NaN"};if(void 0!==cminfo.completionstate){var _this$COMPLETIONS$cmi;data.state=cminfo.completionstate,data.hasstate=!0;let statename=null!==(_this$COMPLETIONS$cmi=this.COMPLETIONS[cminfo.completionstate])&&void 0!==_this$COMPLETIONS$cmi?_this$COMPLETIONS$cmi:"NaN";void 0!==cminfo.isoverallcomplete&&!0===cminfo.isoverallcomplete&&(statename="complete"),data["is".concat(statename)]=!0}return data}allItemsArray(state){var _state$course$section2;const items=[];return(null!==(_state$course$section2=state.course.sectionlist)&&void 0!==_state$course$section2?_state$course$section2:[]).forEach((sectionid=>{var _sectioninfo$cmlist2;const sectioninfo=state.section.get(sectionid);items.push({type:"section",id:sectioninfo.id,url:sectioninfo.sectionurl});(null!==(_sectioninfo$cmlist2=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist2?_sectioninfo$cmlist2:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid);items.push({type:"cm",id:cminfo.id,url:cminfo.url})}))})),items}canUseStealth(state,cmIds){return cmIds.some((cmId=>{var _cminfo$allowstealth;const cminfo=state.cm.get(cmId);return null!==(_cminfo$allowstealth=null==cminfo?void 0:cminfo.allowstealth)&&void 0!==_cminfo$allowstealth&&_cminfo$allowstealth}))}},_exports.default}));
 
 //# sourceMappingURL=exporter.min.js.map
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseeditor/exporter.min.js.map b/course/format/amd/build/local/courseeditor/exporter.min.js.map
index 56cfcc968eca0..336e22c8dfe10 100644
--- a/course/format/amd/build/local/courseeditor/exporter.min.js.map
+++ b/course/format/amd/build/local/courseeditor/exporter.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"exporter.min.js","sources":["../../../src/local/courseeditor/exporter.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Module to export parts of the state and transform them to be used in templates\n * and as draggable data.\n *\n * @module     core_courseformat/local/courseeditor/exporter\n * @class      core_courseformat/local/courseeditor/exporter\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nexport default class {\n\n    /**\n     * Class constructor.\n     *\n     * @param {CourseEditor} reactive the course editor object\n     */\n    constructor(reactive) {\n        this.reactive = reactive;\n\n        // Completions states are defined in lib/completionlib.php. There are 4 different completion\n        // state values, however, the course index uses the same state for complete and complete_pass.\n        // This is the reason why completed appears twice in the array.\n        this.COMPLETIONS = ['incomplete', 'complete', 'complete', 'fail'];\n    }\n\n    /**\n     * Generate the course export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Object}\n     */\n    course(state) {\n        // Collect section information from the state.\n        const data = {\n            sections: [],\n            editmode: this.reactive.isEditing,\n            highlighted: state.course.highlighted ?? '',\n        };\n        const sectionlist = this.listedSectionIds(state);\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            const section = this.section(state, sectioninfo);\n            data.sections.push(section);\n        });\n        data.hassections = (data.sections.length != 0);\n\n        return data;\n    }\n\n    /**\n     * Get the IDs of the sections that are listed as regular sections.\n     * @param {Object} state the current state.\n     * @returns {Number[]} the list of section ids that are listed.\n     */\n    listedSectionIds(state) {\n        const fullSectionList = state.course.sectionlist ?? [];\n        return fullSectionList.filter(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            // Delegated sections (controlled by a component) are not listed in course.\n            return sectioninfo.component === null;\n        });\n    }\n\n    /**\n     * Generate a section export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} sectioninfo the section state data.\n     * @returns {Object}\n     */\n    section(state, sectioninfo) {\n        const section = {\n            ...sectioninfo,\n            highlighted: state.course.highlighted ?? '',\n            cms: [],\n        };\n        const cmlist = sectioninfo.cmlist ?? [];\n        cmlist.forEach(cmid => {\n            const cminfo = state.cm.get(cmid);\n            const cm = this.cm(state, cminfo);\n            section.cms.push(cm);\n        });\n        section.hascms = (section.cms.length != 0);\n\n        return section;\n    }\n\n    /**\n     * Generate a cm export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cm(state, cminfo) {\n        const cm = {\n            ...cminfo,\n            isactive: false,\n        };\n        return cm;\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable course module element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} cmid the cours emodule id\n     * @returns {Object|null}\n     */\n    cmDraggableData(state, cmid) {\n        const cminfo = state.cm.get(cmid);\n        if (!cminfo) {\n            return null;\n        }\n\n        // Drop an activity over the next activity is the same as doing anything.\n        let nextcmid;\n        const section = state.section.get(cminfo.sectionid);\n        const currentindex = section?.cmlist.indexOf(cminfo.id);\n        if (currentindex !== undefined) {\n            nextcmid = section?.cmlist[currentindex + 1];\n        }\n\n        return {\n            type: 'cm',\n            id: cminfo.id,\n            name: cminfo.name,\n            sectionid: cminfo.sectionid,\n            delegatesection: cminfo.delegatesection,\n            nextcmid,\n        };\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable section element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} sectionid the cours section id\n     * @returns {Object|null}\n     */\n    sectionDraggableData(state, sectionid) {\n        const sectioninfo = state.section.get(sectionid);\n        if (!sectioninfo) {\n            return null;\n        }\n        return {\n            type: 'section',\n            id: sectioninfo.id,\n            name: sectioninfo.name,\n            number: sectioninfo.number,\n        };\n    }\n\n    /**\n     * Generate a file draggable structure.\n     *\n     * This method is used when files are dragged on the browser.\n     *\n     * @param {*} state the state object\n     * @param {*} dataTransfer the current data tranfer data\n     * @returns {Object|null}\n     */\n    fileDraggableData(state, dataTransfer) {\n        const files = [];\n        // Browsers do not provide the file list until the drop event.\n        if (dataTransfer.files?.length > 0) {\n            dataTransfer.files.forEach(file => {\n                files.push(file);\n            });\n        }\n        return {\n            type: 'files',\n            files,\n        };\n    }\n\n    /**\n     * Generate a completion export data from the cm element.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cmCompletion(state, cminfo) {\n        const data = {\n            statename: '',\n            state: 'NaN',\n        };\n        if (cminfo.completionstate !== undefined) {\n            data.state = cminfo.completionstate;\n            data.hasstate = true;\n            const statename = this.COMPLETIONS[cminfo.completionstate] ?? 'NaN';\n            data[`is${statename}`] = true;\n        }\n        return data;\n    }\n\n    /**\n     * Return a sorted list of all sections and cms items in the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Array} all sections and cms items in the state.\n     */\n    allItemsArray(state) {\n        const items = [];\n        const sectionlist = state.course.sectionlist ?? [];\n        // Add sections.\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid);\n            items.push({type: 'section', id: sectioninfo.id, url: sectioninfo.sectionurl});\n            // Add cms.\n            const cmlist = sectioninfo.cmlist ?? [];\n            cmlist.forEach(cmid => {\n                const cminfo = state.cm.get(cmid);\n                items.push({type: 'cm', id: cminfo.id, url: cminfo.url});\n            });\n        });\n        return items;\n    }\n\n    /**\n     * Check is some activities of a list can be stealth.\n     *\n     * @param {Object} state the current state.\n     * @param {Number[]} cmIds the module ids to check\n     * @returns {Boolean} if any of the activities can be stealth.\n     */\n    canUseStealth(state, cmIds) {\n        return cmIds.some(cmId => {\n            const cminfo = state.cm.get(cmId);\n            return cminfo?.allowstealth ?? false;\n        });\n    }\n}\n"],"names":["constructor","reactive","COMPLETIONS","course","state","data","sections","editmode","this","isEditing","highlighted","listedSectionIds","forEach","sectionid","sectioninfo","section","get","push","hassections","length","sectionlist","filter","component","cms","cmlist","cmid","cminfo","cm","hascms","isactive","cmDraggableData","nextcmid","currentindex","indexOf","id","undefined","type","name","delegatesection","sectionDraggableData","number","fileDraggableData","dataTransfer","files","file","cmCompletion","statename","completionstate","hasstate","allItemsArray","items","url","sectionurl","canUseStealth","cmIds","some","cmId","allowstealth"],"mappings":";;;;;;;;;;MA+BIA,YAAYC,eACHA,SAAWA,cAKXC,YAAc,CAAC,aAAc,WAAY,WAAY,QAS9DC,OAAOC,uCAEGC,KAAO,CACTC,SAAU,GACVC,SAAUC,KAAKP,SAASQ,UACxBC,0CAAaN,MAAMD,OAAOO,mEAAe,WAEzBF,KAAKG,iBAAiBP,OAC9BQ,SAAQC,yCACVC,uCAAcV,MAAMW,QAAQC,IAAIH,4DAAc,GAC9CE,QAAUP,KAAKO,QAAQX,MAAOU,aACpCT,KAAKC,SAASW,KAAKF,YAEvBV,KAAKa,YAAuC,GAAxBb,KAAKC,SAASa,OAE3Bd,KAQXM,iBAAiBP,sEACWA,MAAMD,OAAOiB,mEAAe,IAC7BC,QAAOR,2CAGO,oCAFbT,MAAMW,QAAQC,IAAIH,8DAAc,IAEjCS,aAW3BP,QAAQX,MAAOU,kEACLC,QAAU,IACTD,YACHJ,2CAAaN,MAAMD,OAAOO,qEAAe,GACzCa,IAAK,uCAEMT,YAAYU,0DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MACtBE,GAAKnB,KAAKmB,GAAGvB,MAAOsB,QAC1BX,QAAQQ,IAAIN,KAAKU,OAErBZ,QAAQa,OAAgC,GAAtBb,QAAQQ,IAAIJ,OAEvBJ,QAUXY,GAAGvB,MAAOsB,cACK,IACJA,OACHG,UAAU,GAelBC,gBAAgB1B,MAAOqB,YACbC,OAAStB,MAAMuB,GAAGX,IAAIS,UACvBC,cACM,SAIPK,eACEhB,QAAUX,MAAMW,QAAQC,IAAIU,OAAOb,WACnCmB,aAAejB,MAAAA,eAAAA,QAASS,OAAOS,QAAQP,OAAOQ,gBAC/BC,IAAjBH,eACAD,SAAWhB,MAAAA,eAAAA,QAASS,OAAOQ,aAAe,IAGvC,CACHI,KAAM,KACNF,GAAIR,OAAOQ,GACXG,KAAMX,OAAOW,KACbxB,UAAWa,OAAOb,UAClByB,gBAAiBZ,OAAOY,gBACxBP,SAAAA,UAcRQ,qBAAqBnC,MAAOS,iBAClBC,YAAcV,MAAMW,QAAQC,IAAIH,kBACjCC,YAGE,CACHsB,KAAM,UACNF,GAAIpB,YAAYoB,GAChBG,KAAMvB,YAAYuB,KAClBG,OAAQ1B,YAAY0B,QANb,KAmBfC,kBAAkBrC,MAAOsC,4CACfC,MAAQ,sCAEVD,aAAaC,gEAAOxB,QAAS,GAC7BuB,aAAaC,MAAM/B,SAAQgC,OACvBD,MAAM1B,KAAK2B,SAGZ,CACHR,KAAM,QACNO,MAAAA,OAWRE,aAAazC,MAAOsB,cACVrB,KAAO,CACTyC,UAAW,GACX1C,MAAO,eAEoB+B,IAA3BT,OAAOqB,gBAA+B,2BACtC1C,KAAKD,MAAQsB,OAAOqB,gBACpB1C,KAAK2C,UAAW,QACVF,wCAAYtC,KAAKN,YAAYwB,OAAOqB,wEAAoB,MAC9D1C,iBAAUyC,aAAe,SAEtBzC,KASX4C,cAAc7C,wCACJ8C,MAAQ,yCACM9C,MAAMD,OAAOiB,qEAAe,IAEpCR,SAAQC,2CACVC,YAAcV,MAAMW,QAAQC,IAAIH,WACtCqC,MAAMjC,KAAK,CAACmB,KAAM,UAAWF,GAAIpB,YAAYoB,GAAIiB,IAAKrC,YAAYsC,2CAEnDtC,YAAYU,4DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MAC5ByB,MAAMjC,KAAK,CAACmB,KAAM,KAAMF,GAAIR,OAAOQ,GAAIiB,IAAKzB,OAAOyB,YAGpDD,MAUXG,cAAcjD,MAAOkD,cACVA,MAAMC,MAAKC,sCACR9B,OAAStB,MAAMuB,GAAGX,IAAIwC,0CACrB9B,MAAAA,cAAAA,OAAQ+B"}
\ No newline at end of file
+{"version":3,"file":"exporter.min.js","sources":["../../../src/local/courseeditor/exporter.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Module to export parts of the state and transform them to be used in templates\n * and as draggable data.\n *\n * @module     core_courseformat/local/courseeditor/exporter\n * @class      core_courseformat/local/courseeditor/exporter\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nexport default class {\n\n    /**\n     * Class constructor.\n     *\n     * @param {CourseEditor} reactive the course editor object\n     */\n    constructor(reactive) {\n        this.reactive = reactive;\n\n        // Completions states are defined in lib/completionlib.php. There are 4 different completion\n        // state values, however, the course index uses the same state for complete and complete_pass.\n        // This is the reason why completed appears twice in the array.\n        this.COMPLETIONS = ['incomplete', 'complete', 'complete', 'fail'];\n    }\n\n    /**\n     * Generate the course export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Object}\n     */\n    course(state) {\n        // Collect section information from the state.\n        const data = {\n            sections: [],\n            editmode: this.reactive.isEditing,\n            highlighted: state.course.highlighted ?? '',\n        };\n        const sectionlist = this.listedSectionIds(state);\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            const section = this.section(state, sectioninfo);\n            data.sections.push(section);\n        });\n        data.hassections = (data.sections.length != 0);\n\n        return data;\n    }\n\n    /**\n     * Get the IDs of the sections that are listed as regular sections.\n     * @param {Object} state the current state.\n     * @returns {Number[]} the list of section ids that are listed.\n     */\n    listedSectionIds(state) {\n        const fullSectionList = state.course.sectionlist ?? [];\n        return fullSectionList.filter(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            // Delegated sections (controlled by a component) are not listed in course.\n            return sectioninfo.component === null;\n        });\n    }\n\n    /**\n     * Generate a section export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} sectioninfo the section state data.\n     * @returns {Object}\n     */\n    section(state, sectioninfo) {\n        const section = {\n            ...sectioninfo,\n            highlighted: state.course.highlighted ?? '',\n            cms: [],\n        };\n        const cmlist = sectioninfo.cmlist ?? [];\n        cmlist.forEach(cmid => {\n            const cminfo = state.cm.get(cmid);\n            const cm = this.cm(state, cminfo);\n            section.cms.push(cm);\n        });\n        section.hascms = (section.cms.length != 0);\n\n        return section;\n    }\n\n    /**\n     * Generate a cm export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cm(state, cminfo) {\n        const cm = {\n            ...cminfo,\n            isactive: false,\n        };\n        return cm;\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable course module element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} cmid the cours emodule id\n     * @returns {Object|null}\n     */\n    cmDraggableData(state, cmid) {\n        const cminfo = state.cm.get(cmid);\n        if (!cminfo) {\n            return null;\n        }\n\n        // Drop an activity over the next activity is the same as doing anything.\n        let nextcmid;\n        const section = state.section.get(cminfo.sectionid);\n        const currentindex = section?.cmlist.indexOf(cminfo.id);\n        if (currentindex !== undefined) {\n            nextcmid = section?.cmlist[currentindex + 1];\n        }\n\n        return {\n            type: 'cm',\n            id: cminfo.id,\n            name: cminfo.name,\n            sectionid: cminfo.sectionid,\n            delegatesection: cminfo.delegatesection,\n            nextcmid,\n        };\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable section element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} sectionid the cours section id\n     * @returns {Object|null}\n     */\n    sectionDraggableData(state, sectionid) {\n        const sectioninfo = state.section.get(sectionid);\n        if (!sectioninfo) {\n            return null;\n        }\n        return {\n            type: 'section',\n            id: sectioninfo.id,\n            name: sectioninfo.name,\n            number: sectioninfo.number,\n        };\n    }\n\n    /**\n     * Generate a file draggable structure.\n     *\n     * This method is used when files are dragged on the browser.\n     *\n     * @param {*} state the state object\n     * @param {*} dataTransfer the current data tranfer data\n     * @returns {Object|null}\n     */\n    fileDraggableData(state, dataTransfer) {\n        const files = [];\n        // Browsers do not provide the file list until the drop event.\n        if (dataTransfer.files?.length > 0) {\n            dataTransfer.files.forEach(file => {\n                files.push(file);\n            });\n        }\n        return {\n            type: 'files',\n            files,\n        };\n    }\n\n    /**\n     * Generate a completion export data from the cm element.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cmCompletion(state, cminfo) {\n        const data = {\n            statename: '',\n            state: 'NaN',\n        };\n        if (cminfo.completionstate !== undefined) {\n            data.state = cminfo.completionstate;\n            data.hasstate = true;\n            let statename = this.COMPLETIONS[cminfo.completionstate] ?? 'NaN';\n            if (cminfo.isoverallcomplete !== undefined && cminfo.isoverallcomplete === true) {\n                statename = 'complete';\n            }\n            data[`is${statename}`] = true;\n        }\n        return data;\n    }\n\n    /**\n     * Return a sorted list of all sections and cms items in the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Array} all sections and cms items in the state.\n     */\n    allItemsArray(state) {\n        const items = [];\n        const sectionlist = state.course.sectionlist ?? [];\n        // Add sections.\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid);\n            items.push({type: 'section', id: sectioninfo.id, url: sectioninfo.sectionurl});\n            // Add cms.\n            const cmlist = sectioninfo.cmlist ?? [];\n            cmlist.forEach(cmid => {\n                const cminfo = state.cm.get(cmid);\n                items.push({type: 'cm', id: cminfo.id, url: cminfo.url});\n            });\n        });\n        return items;\n    }\n\n    /**\n     * Check is some activities of a list can be stealth.\n     *\n     * @param {Object} state the current state.\n     * @param {Number[]} cmIds the module ids to check\n     * @returns {Boolean} if any of the activities can be stealth.\n     */\n    canUseStealth(state, cmIds) {\n        return cmIds.some(cmId => {\n            const cminfo = state.cm.get(cmId);\n            return cminfo?.allowstealth ?? false;\n        });\n    }\n}\n"],"names":["constructor","reactive","COMPLETIONS","course","state","data","sections","editmode","this","isEditing","highlighted","listedSectionIds","forEach","sectionid","sectioninfo","section","get","push","hassections","length","sectionlist","filter","component","cms","cmlist","cmid","cminfo","cm","hascms","isactive","cmDraggableData","nextcmid","currentindex","indexOf","id","undefined","type","name","delegatesection","sectionDraggableData","number","fileDraggableData","dataTransfer","files","file","cmCompletion","statename","completionstate","hasstate","isoverallcomplete","allItemsArray","items","url","sectionurl","canUseStealth","cmIds","some","cmId","allowstealth"],"mappings":";;;;;;;;;;MA+BIA,YAAYC,eACHA,SAAWA,cAKXC,YAAc,CAAC,aAAc,WAAY,WAAY,QAS9DC,OAAOC,uCAEGC,KAAO,CACTC,SAAU,GACVC,SAAUC,KAAKP,SAASQ,UACxBC,0CAAaN,MAAMD,OAAOO,mEAAe,WAEzBF,KAAKG,iBAAiBP,OAC9BQ,SAAQC,yCACVC,uCAAcV,MAAMW,QAAQC,IAAIH,4DAAc,GAC9CE,QAAUP,KAAKO,QAAQX,MAAOU,aACpCT,KAAKC,SAASW,KAAKF,YAEvBV,KAAKa,YAAuC,GAAxBb,KAAKC,SAASa,OAE3Bd,KAQXM,iBAAiBP,sEACWA,MAAMD,OAAOiB,mEAAe,IAC7BC,QAAOR,2CAGO,oCAFbT,MAAMW,QAAQC,IAAIH,8DAAc,IAEjCS,aAW3BP,QAAQX,MAAOU,kEACLC,QAAU,IACTD,YACHJ,2CAAaN,MAAMD,OAAOO,qEAAe,GACzCa,IAAK,uCAEMT,YAAYU,0DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MACtBE,GAAKnB,KAAKmB,GAAGvB,MAAOsB,QAC1BX,QAAQQ,IAAIN,KAAKU,OAErBZ,QAAQa,OAAgC,GAAtBb,QAAQQ,IAAIJ,OAEvBJ,QAUXY,GAAGvB,MAAOsB,cACK,IACJA,OACHG,UAAU,GAelBC,gBAAgB1B,MAAOqB,YACbC,OAAStB,MAAMuB,GAAGX,IAAIS,UACvBC,cACM,SAIPK,eACEhB,QAAUX,MAAMW,QAAQC,IAAIU,OAAOb,WACnCmB,aAAejB,MAAAA,eAAAA,QAASS,OAAOS,QAAQP,OAAOQ,gBAC/BC,IAAjBH,eACAD,SAAWhB,MAAAA,eAAAA,QAASS,OAAOQ,aAAe,IAGvC,CACHI,KAAM,KACNF,GAAIR,OAAOQ,GACXG,KAAMX,OAAOW,KACbxB,UAAWa,OAAOb,UAClByB,gBAAiBZ,OAAOY,gBACxBP,SAAAA,UAcRQ,qBAAqBnC,MAAOS,iBAClBC,YAAcV,MAAMW,QAAQC,IAAIH,kBACjCC,YAGE,CACHsB,KAAM,UACNF,GAAIpB,YAAYoB,GAChBG,KAAMvB,YAAYuB,KAClBG,OAAQ1B,YAAY0B,QANb,KAmBfC,kBAAkBrC,MAAOsC,4CACfC,MAAQ,sCAEVD,aAAaC,gEAAOxB,QAAS,GAC7BuB,aAAaC,MAAM/B,SAAQgC,OACvBD,MAAM1B,KAAK2B,SAGZ,CACHR,KAAM,QACNO,MAAAA,OAWRE,aAAazC,MAAOsB,cACVrB,KAAO,CACTyC,UAAW,GACX1C,MAAO,eAEoB+B,IAA3BT,OAAOqB,gBAA+B,2BACtC1C,KAAKD,MAAQsB,OAAOqB,gBACpB1C,KAAK2C,UAAW,MACZF,wCAAYtC,KAAKN,YAAYwB,OAAOqB,wEAAoB,WAC3BZ,IAA7BT,OAAOuB,oBAAgE,IAA7BvB,OAAOuB,oBACjDH,UAAY,YAEhBzC,iBAAUyC,aAAe,SAEtBzC,KASX6C,cAAc9C,wCACJ+C,MAAQ,yCACM/C,MAAMD,OAAOiB,qEAAe,IAEpCR,SAAQC,2CACVC,YAAcV,MAAMW,QAAQC,IAAIH,WACtCsC,MAAMlC,KAAK,CAACmB,KAAM,UAAWF,GAAIpB,YAAYoB,GAAIkB,IAAKtC,YAAYuC,2CAEnDvC,YAAYU,4DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MAC5B0B,MAAMlC,KAAK,CAACmB,KAAM,KAAMF,GAAIR,OAAOQ,GAAIkB,IAAK1B,OAAO0B,YAGpDD,MAUXG,cAAclD,MAAOmD,cACVA,MAAMC,MAAKC,sCACR/B,OAAStB,MAAMuB,GAAGX,IAAIyC,0CACrB/B,MAAAA,cAAAA,OAAQgC"}
\ No newline at end of file
diff --git a/course/format/amd/src/local/courseeditor/exporter.js b/course/format/amd/src/local/courseeditor/exporter.js
index 474ac7e58e8d7..3b8230b19ded5 100644
--- a/course/format/amd/src/local/courseeditor/exporter.js
+++ b/course/format/amd/src/local/courseeditor/exporter.js
@@ -210,7 +210,10 @@ export default class {
         if (cminfo.completionstate !== undefined) {
             data.state = cminfo.completionstate;
             data.hasstate = true;
-            const statename = this.COMPLETIONS[cminfo.completionstate] ?? 'NaN';
+            let statename = this.COMPLETIONS[cminfo.completionstate] ?? 'NaN';
+            if (cminfo.isoverallcomplete !== undefined && cminfo.isoverallcomplete === true) {
+                statename = 'complete';
+            }
             data[`is${statename}`] = true;
         }
         return data;
diff --git a/course/format/classes/output/local/state/cm.php b/course/format/classes/output/local/state/cm.php
index 84853d4f2adfc..65e72d9da085b 100644
--- a/course/format/classes/output/local/state/cm.php
+++ b/course/format/classes/output/local/state/cm.php
@@ -106,8 +106,9 @@ public function export_for_template(renderer_base $output): stdClass {
         $completioninfo = new completion_info($course);
         $data->istrackeduser = $this->istrackeduser ?? $completioninfo->is_tracked_user($USER->id);
         if ($data->istrackeduser && $completioninfo->is_enabled($cm)) {
-            $completiondata = $completioninfo->get_data($cm);
-            $data->completionstate = $completiondata->completionstate;
+            $completiondata = new \core_completion\cm_completion_details($completioninfo, $cm, $USER->id, false);
+            $data->completionstate = $completiondata->get_overall_completion();
+            $data->isoverallcomplete = $completiondata->is_overall_complete();
         }
 
         $data->allowstealth = !empty($CFG->allowstealth) && $format->allow_stealth_module_visibility($cm, $section);
diff --git a/course/format/tests/behat/courseindex_completion.feature b/course/format/tests/behat/courseindex_completion.feature
index 72ed6fd0d2382..fdaa206d84c55 100644
--- a/course/format/tests/behat/courseindex_completion.feature
+++ b/course/format/tests/behat/courseindex_completion.feature
@@ -88,8 +88,8 @@ Feature: Course index completion icons
       | questioncategory | qtype     | name           | questiontext              |
       | Test questions   | truefalse | First question | Answer the first question |
     And the following "activities" exist:
-      | activity | name           | course | idnumber | attempts | gradepass | completion | completionusegrade | completionpass | completionattemptsexhausted |
-      | quiz     | Test quiz name | C1     | quiz1    | 1        | 5.00      | 2          | 1                  | 1              | 1                           |
+      | activity | name           | course | idnumber | attempts | gradepass | completion | completionusegrade | completionpassgrade | completionattemptsexhausted |
+      | quiz     | Test quiz name | C1     | quiz1    | 1        | 5.00      | 2          | 1                  | 1                   | 1                           |
     And quiz "Test quiz name" contains the following questions:
       | question       | page |
       | First question | 1    |

From b859ff4337513158e23efbde4f8d8b58e196a7eb Mon Sep 17 00:00:00 2001
From: Angelia Dela Cruz <andelacruz@ubiquitous-tech.com>
Date: Thu, 21 Dec 2023 11:24:29 +0800
Subject: [PATCH 68/75] MDL-80453 mod_glossary: Behat for different glossary
 format display

---
 .../behat/glossary_display_formats.feature    | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 mod/glossary/tests/behat/glossary_display_formats.feature

diff --git a/mod/glossary/tests/behat/glossary_display_formats.feature b/mod/glossary/tests/behat/glossary_display_formats.feature
new file mode 100644
index 0000000000000..2a0f0ae764df0
--- /dev/null
+++ b/mod/glossary/tests/behat/glossary_display_formats.feature
@@ -0,0 +1,99 @@
+@mod @mod_glossary
+Feature: Glossary can be set to various display formats
+  In order to display different glossary formats
+  As a teacher
+  I can set the glossary activity display format
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | teacher1 | Teacher   | One      | teacher1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+    Given the following "activities" exist:
+      | activity | course | name       |
+      | glossary | C1     | Glossary 1 |
+    And the following "mod_glossary > entries" exist:
+      | glossary   | concept | definition         |
+      | Glossary 1 | Entry 1 | Entry 1 definition |
+      | Glossary 1 | Entry 2 | Entry 2 definition |
+
+  Scenario: Glossary display format is entry list style
+    Given I am on the "Glossary 1" "glossary activity editing" page logged in as teacher1
+    And I set the following fields to these values:
+      | displayformat | entrylist |
+    When I press "Save and display"
+    # Confirm that glossary display format is entry list.
+    # In this format, the concept definitions are not displayed.
+    Then I should not see "by Admin User"
+    And I should not see "Entry 1 definition"
+    And I should not see "Entry 2 definition"
+    And ".entrylist" "css_element" should exist
+
+  Scenario: Glossary display format is FAQ-style
+    Given I am on the "Glossary 1" "glossary activity editing" page logged in as teacher1
+    And I set the following fields to these values:
+      | displayformat | faq |
+    When I press "Save and display"
+    # Confirm that glossary format is FAQ.
+    # In this format, the words Question and Answer are displayed.
+    Then I should see "Question:"
+    And I should see "Answer:"
+    And ".faq" "css_element" should exist
+
+  @_file_upload @javascript
+  Scenario: Glossary display format is full without author style
+    Given I am on the "Glossary 1" "glossary activity editing" page logged in as teacher1
+    And I set the following fields to these values:
+      | displayformat | fullwithoutauthor |
+    And I press "Save and display"
+    And I press "Add entry"
+    # Add an entry with an attachment.
+    And I set the following fields to these values:
+      | Concept    | Entry 3                        |
+      | Definition | Entry 3 definition             |
+      | Attachment | lib/tests/fixtures/gd-logo.png |
+    When I press "Save changes"
+    # Confirm that glossary format is full without author style.
+    # In this format, the image link should exist and author's name should not be visible.
+    Then "gd-logo.png" "link" should exist
+    And I should not see "by Admin User"
+    And ".fullwithoutauthor" "css_element" should exist
+
+  @_file_upload @javascript
+  Scenario: Glossary display format is encyclopedia style
+    Given I am on the "Glossary 1" "glossary activity editing" page logged in as teacher1
+    And I set the following fields to these values:
+      | displayformat | encyclopedia |
+    And I press "Save and display"
+    And I press "Add entry"
+    # Add an entry with an attachment.
+    And I set the following fields to these values:
+      | Concept    | Entry 3                        |
+      | Definition | Entry 3 definition             |
+      | Attachment | lib/tests/fixtures/gd-logo.png |
+    When I press "Save changes"
+    # Confirm that glossary format is encyclopedia.
+    # In this format, the image element should be displayed.
+    Then "//img[contains(@src, 'gd-logo.png')]" "xpath_element" should exist
+    And ".encyclopedia" "css_element" should exist
+
+  Scenario Outline: Glossary display format can be set to dictionary, continuous and full with author
+    Given I am on the "Glossary 1" "glossary activity editing" page logged in as teacher1
+    # Assign the corresponding display format to glossary activity.
+    And I set the following fields to these values:
+      | displayformat | <display_format> |
+    When I press "Save and display"
+    # Confirm that glossary format is the display format set in the previous step.
+    Then I should <visibility> "by Admin User"
+    And ".<display_format>" "css_element" should exist
+
+    Examples:
+      | display_format | visibility |
+      | dictionary     | not see    |
+      | continuous     | not see    |
+      | fullwithauthor | see        |

From 0fd8376451d1a2da859a3b23fbb905737909a36e Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 22 Apr 2024 09:34:01 +0100
Subject: [PATCH 69/75] MDL-76690 reportbuilder: final removal of deprecated
 helper methods.

---
 .../classes/local/audiences/base.php          |  8 ++-
 .../classes/local/helpers/audience.php        | 62 +------------------
 .../classes/local/helpers/report.php          | 37 +----------
 reportbuilder/upgrade.txt                     |  6 ++
 4 files changed, 17 insertions(+), 96 deletions(-)

diff --git a/reportbuilder/classes/local/audiences/base.php b/reportbuilder/classes/local/audiences/base.php
index ffecfe625326e..fba9d21f22416 100644
--- a/reportbuilder/classes/local/audiences/base.php
+++ b/reportbuilder/classes/local/audiences/base.php
@@ -22,6 +22,7 @@
 use MoodleQuickForm;
 use stdClass;
 use core\output\notification;
+use core_reportbuilder\external\custom_report_audience_cards_exporter;
 use core_reportbuilder\local\helpers\database;
 use core_reportbuilder\local\models\audience;
 use core_reportbuilder\report_access_exception;
@@ -48,7 +49,8 @@ protected function __construct() {
     }
 
     /**
-     * Loads an existing instance of audience with persistent
+     * Creates an instance of audience type, with persistent. Typically by loading an existing record, however in the absence of
+     * specified classname (in the case of {@see custom_report_audience_cards_exporter}) we create one based on the current class
      *
      * @param int $id
      * @param null|stdClass $record
@@ -56,9 +58,9 @@ protected function __construct() {
      */
     final public static function instance(int $id = 0, ?stdClass $record = null): ?self {
         $persistent = new audience($id, $record);
-        // Needed for get_audience_types() method.
+
+        // Populate persistent classname automatically if not set (e.g. when not loading an existing instance).
         if (!$classname = $persistent->get('classname')) {
-            // Use the called class name.
             $classname = get_called_class();
             $persistent->set('classname', $classname);
         }
diff --git a/reportbuilder/classes/local/helpers/audience.php b/reportbuilder/classes/local/helpers/audience.php
index d3349137ff64a..9636685631bcc 100644
--- a/reportbuilder/classes/local/helpers/audience.php
+++ b/reportbuilder/classes/local/helpers/audience.php
@@ -255,66 +255,10 @@ public static function get_audiences_for_report_schedules(int $reportid): array
     }
 
     /**
-     * Returns the list of audiences types in the system.
-     *
-     * @return array
-     */
-    private static function get_audience_types(): array {
-        $sources = [];
-
-        $audiences = core_component::get_component_classes_in_namespace(null, 'reportbuilder\\audience');
-        foreach ($audiences as $class => $path) {
-            $audienceclass = $class::instance();
-            if (is_subclass_of($class, base::class) && $audienceclass->user_can_add()) {
-                $componentname = $audienceclass->get_component_displayname();
-                $sources[$componentname][$class] = $audienceclass->get_name();
-            }
-        }
-
-        return $sources;
-    }
-
-    /**
-     * Get all the audiences types the current user can add to, organised by categories.
-     *
-     * @return array
-     *
      * @deprecated since Moodle 4.1 - please do not use this function any more, {@see custom_report_audience_cards_exporter}
      */
-    public static function get_all_audiences_menu_types(): array {
-        debugging('The function ' . __FUNCTION__ . '() is deprecated, please do not use it any more. ' .
-            'See \'custom_report_audience_cards_exporter\' class for replacement', DEBUG_DEVELOPER);
-
-        $menucardsarray = [];
-        $notavailablestr = get_string('notavailable', 'moodle');
-
-        $audiencetypes = self::get_audience_types();
-        $audiencetypeindex = 0;
-        foreach ($audiencetypes as $categoryname => $audience) {
-            $menucards = [
-                'name' => $categoryname,
-                'key' => 'index' . ++$audiencetypeindex,
-            ];
-
-            foreach ($audience as $classname => $name) {
-                $class = $classname::instance();
-                $title = $class->is_available() ? get_string('addaudience', 'core_reportbuilder', $class->get_name()) :
-                    $notavailablestr;
-                $menucard['title'] = $title;
-                $menucard['name'] = $class->get_name();
-                $menucard['disabled'] = !$class->is_available();
-                $menucard['identifier'] = get_class($class);
-                $menucard['action'] = 'add-audience';
-                $menucards['items'][] = $menucard;
-            }
-
-            // Order audience types on each category alphabetically.
-            core_collator::asort_array_of_arrays_by_key($menucards['items'], 'name');
-            $menucards['items'] = array_values($menucards['items']);
-
-            $menucardsarray[] = $menucards;
-        }
-
-        return $menucardsarray;
+    #[\core\attribute\deprecated('custom_report_audience_cards_exporter', since: '4.1', final: true)]
+    public static function get_all_audiences_menu_types() {
+        \core\deprecation::emit_deprecation_if_present([self::class, __FUNCTION__]);
     }
 }
diff --git a/reportbuilder/classes/local/helpers/report.php b/reportbuilder/classes/local/helpers/report.php
index fbc5d1b472ffe..a8d87559f2b73 100644
--- a/reportbuilder/classes/local/helpers/report.php
+++ b/reportbuilder/classes/local/helpers/report.php
@@ -416,42 +416,11 @@ public static function reorder_report_filter(int $reportid, int $filterid, int $
     }
 
     /**
-     * Get available columns for a given report
-     *
-     * @param report_model $persistent
-     * @return array
-     *
      * @deprecated since Moodle 4.1 - please do not use this function any more, {@see custom_report_column_cards_exporter}
      */
-    public static function get_available_columns(report_model $persistent): array {
-        debugging('The function ' . __FUNCTION__ . '() is deprecated, please do not use it any more. ' .
-            'See \'custom_report_column_cards_exporter\' class for replacement', DEBUG_DEVELOPER);
-
-        $available = [];
-
-        $report = manager::get_report_from_persistent($persistent);
-
-        // Get current report columns.
-        foreach ($report->get_columns() as $column) {
-            $entityname = $column->get_entity_name();
-            $entitytitle = $column->get_title();
-            if (!array_key_exists($entityname, $available)) {
-                $available[$entityname] = [
-                    'name' => (string) $report->get_entity_title($entityname),
-                    'key' => $entityname,
-                    'items' => [],
-                ];
-            }
-
-            $available[$entityname]['items'][] = [
-                'name' => $entitytitle,
-                'identifier' => $column->get_unique_identifier(),
-                'title' => get_string('addcolumn', 'core_reportbuilder', $entitytitle),
-                'action' => 'report-add-column'
-            ];
-        }
-
-        return array_values($available);
+    #[\core\attribute\deprecated('custom_report_column_cards_exporter', since: '4.1', final: true)]
+    public static function get_available_columns() {
+        \core\deprecation::emit_deprecation_if_present([self::class, __FUNCTION__]);
     }
 
     /**
diff --git a/reportbuilder/upgrade.txt b/reportbuilder/upgrade.txt
index 08c38f8fb3990..aecd7ac0800be 100644
--- a/reportbuilder/upgrade.txt
+++ b/reportbuilder/upgrade.txt
@@ -1,6 +1,12 @@
 This file describes API changes in /reportbuilder/*
 Information provided here is intended especially for developers.
 
+=== 4.5 ===
+
+* The following previously deprecated local helper methods have been removed and can no longer be used:
+  - `audience::get_all_audiences_menu_types`
+  - `report::get_available_columns`
+
 === 4.4 ===
 
 * New methods `get_identity_[columns|filters]` in user entity, for retrieving all user identity field report elements

From ab37e1e397f7d74c9722ce01dabfc1312f67a920 Mon Sep 17 00:00:00 2001
From: "info@eWallah.net" <info@eWallah.net>
Date: Wed, 8 May 2024 21:48:40 +0200
Subject: [PATCH 70/75] MDL-80972 behat: Behat check_server_status can provide
 better info.

---
 lib/behat/classes/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/behat/classes/util.php b/lib/behat/classes/util.php
index 1eb74ac266a93..25d9bfb7db6ce 100644
--- a/lib/behat/classes/util.php
+++ b/lib/behat/classes/util.php
@@ -226,7 +226,7 @@ public static function check_server_status() {
 
             behat_error (BEHAT_EXITCODE_REQUIREMENT, $CFG->behat_wwwroot . ' is not available, ensure you specified ' .
                 'correct url and that the server is set up and started.' . PHP_EOL . ' More info in ' .
-                behat_command::DOCS_URL . PHP_EOL);
+                behat_command::DOCS_URL . PHP_EOL . parent::get_site_info());
         }
 
         // Check if cli version is same as web version.

From 697815159f4ecbc5b04303b0fa5747dc9eb72f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Wed, 8 May 2024 12:26:54 +0200
Subject: [PATCH 71/75] MDL-81713 mod_quiz: Add random question 'Parent
 category' help icon.

---
 mod/quiz/lib.php                                 |  3 +++
 .../templates/add_random_question_form.mustache  | 16 ++++++++++++++++
 mod/quiz/tests/behat/editing_add_random.feature  |  1 +
 3 files changed, 20 insertions(+)

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index db6b8294e5d8c..98ac5626f2060 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -2405,6 +2405,9 @@ function mod_quiz_output_fragment_add_random_question_form($args) {
         'questioncategoryoptions' => $catoptions,
     ];
 
+    $helpicon = new \help_icon('parentcategory', 'question');
+    $data['questioncategoryhelp'] = $helpicon->export_for_template($renderer);
+
     $result = $OUTPUT->render_from_template('mod_quiz/add_random_question_form', $data);
 
     return $result;
diff --git a/mod/quiz/templates/add_random_question_form.mustache b/mod/quiz/templates/add_random_question_form.mustache
index 6a95c3c3f9729..db175ae146ffe 100644
--- a/mod/quiz/templates/add_random_question_form.mustache
+++ b/mod/quiz/templates/add_random_question_form.mustache
@@ -33,6 +33,19 @@
                 {"name": "Category 3", "value": "2"}
             ]
         },
+        "questioncategoryhelp": {
+            "title": "Help with something",
+            "text": "Help with something",
+            "url": "http://example.org/help",
+            "linktext": "",
+            "icon": {
+                "extraclasses": "iconhelp",
+                "attributes": [
+                    {"name": "src", "value": "../../../pix/help.svg"},
+                    {"name": "alt", "value": "Help icon"}
+                ]
+            }
+        },
         "questionbank": "<pre>Question bank HTML goes here</pre>"
     }
 }}
@@ -70,6 +83,9 @@
 
             <!-- Select number of random question -->
             <label class="mr-md-2 mb-md-0" for="parentcategory">{{#str}} parentcategory, question {{/str}} </label>
+                {{#questioncategoryhelp}}
+                    {{>core/help_icon}}
+                {{/questioncategoryhelp}}
             <select id="parentcategory" name="parentcategory" class="form-control">
                 {{#questioncategoryoptions}}
                     <optgroup label="{{label}}">
diff --git a/mod/quiz/tests/behat/editing_add_random.feature b/mod/quiz/tests/behat/editing_add_random.feature
index 76232c4090b54..7c66c53a5a7f2 100644
--- a/mod/quiz/tests/behat/editing_add_random.feature
+++ b/mod/quiz/tests/behat/editing_add_random.feature
@@ -98,6 +98,7 @@ Feature: Adding random questions to a quiz based on category and tags
     When I open the "last" add to quiz menu
     And I follow "a random question"
     And I follow "New category"
+    And "Help with Parent category" "icon" should exist in the "id_newcategoryheader" "fieldset"
     And I set the following fields to these values:
       | Name            | New Random category |
       | Parent category |  Default for Quiz 1 |

From f01625abdc108a14e4910006c2ae30f15dd82baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Wed, 8 May 2024 14:08:36 +0200
Subject: [PATCH 72/75] MDL-81713 mod_quiz: Display modal for 'Add random
 question' as mform.

---
 .../add_random_question_form.mustache         | 46 ++++++++++++-------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/mod/quiz/templates/add_random_question_form.mustache b/mod/quiz/templates/add_random_question_form.mustache
index db175ae146ffe..5cf4e428c1bd5 100644
--- a/mod/quiz/templates/add_random_question_form.mustache
+++ b/mod/quiz/templates/add_random_question_form.mustache
@@ -50,7 +50,7 @@
     }
 }}
 <div class="mt-2 position-relative" data-region="add_random_question_form-container">
-    <form action="{{returnurl}}" method="POST" id="add_random_question_form">
+    <form action="{{returnurl}}" method="POST" id="add_random_question_form" class="mform">
         <fieldset id="id_existingcategoryheader">
             <legend>{{#str}} randomfromexistingcategory, mod_quiz {{/str}}</legend>
             <!-- Question bank -->
@@ -78,23 +78,35 @@
         <fieldset id="id_newcategoryheader">
             <legend>{{#str}} randomquestionusinganewcategory, mod_quiz {{/str}}</legend>
             <!-- New categoryname -->
-            <label class="mr-md-2 mb-md-0" for="categoryname">{{#str}} name {{/str}} </label>
-            <input type="text" class="form-control" id="categoryname" name="categoryname" maxlength="254" size="50">
+            <div class="mb-3 row fitem">
+                <div class="col-md-3 col-form-label d-flex pb-0 pr-md-0">
+                    <label class="mr-md-2 mb-md-0" for="categoryname">{{#str}} name {{/str}} </label>
+                </div>
+                <div class="col-md-9 d-flex flex-wrap align-items-start felement" data-fieldtype="text">
+                    <input type="text" class="form-control" id="categoryname" name="categoryname" maxlength="254" size="50">
+                </div>
+            </div>
 
-            <!-- Select number of random question -->
-            <label class="mr-md-2 mb-md-0" for="parentcategory">{{#str}} parentcategory, question {{/str}} </label>
-                {{#questioncategoryhelp}}
-                    {{>core/help_icon}}
-                {{/questioncategoryhelp}}
-            <select id="parentcategory" name="parentcategory" class="form-control">
-                {{#questioncategoryoptions}}
-                    <optgroup label="{{label}}">
-                        {{#options}}
-                            <option value="{{value}}">{{{name}}}</option>
-                        {{/options}}
-                    </optgroup>
-                {{/questioncategoryoptions}}
-            </select>
+            <!-- Select parent of new category -->
+            <div class="mb-3 row fitem">
+                <div class="col-md-3 col-form-label d-flex pb-0 pr-md-0">
+                    <label class="mr-md-2 mb-md-0" for="parentcategory">{{#str}} parentcategory, question {{/str}} </label>
+                    {{#questioncategoryhelp}}
+                        {{>core/help_icon}}
+                    {{/questioncategoryhelp}}
+                </div>
+                <div class="col-md-9 d-flex flex-wrap align-items-start felement" data-fieldtype="select">
+                    <select id="parentcategory" name="parentcategory" class="form-control">
+                        {{#questioncategoryoptions}}
+                            <optgroup label="{{label}}">
+                                {{#options}}
+                                    <option value="{{value}}">{{{name}}}</option>
+                                {{/options}}
+                            </optgroup>
+                        {{/questioncategoryoptions}}
+                    </select>
+                </div>
+            </div>
 
             <!-- Buttons -->
             <div class="modal-footer mt-1" data-region="footer">

From f14c2d35b60d8e63ccb3c0e6b8d050df7373c692 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 9 May 2024 11:32:54 +0800
Subject: [PATCH 73/75] MDL-81713 mod_quiz: Use accessible fieldset name for
 Behat test

---
 mod/quiz/tests/behat/editing_add_random.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/quiz/tests/behat/editing_add_random.feature b/mod/quiz/tests/behat/editing_add_random.feature
index 7c66c53a5a7f2..f62410480f5d7 100644
--- a/mod/quiz/tests/behat/editing_add_random.feature
+++ b/mod/quiz/tests/behat/editing_add_random.feature
@@ -98,7 +98,7 @@ Feature: Adding random questions to a quiz based on category and tags
     When I open the "last" add to quiz menu
     And I follow "a random question"
     And I follow "New category"
-    And "Help with Parent category" "icon" should exist in the "id_newcategoryheader" "fieldset"
+    And "Help with Parent category" "icon" should exist in the "Random question using a new category" "fieldset"
     And I set the following fields to these values:
       | Name            | New Random category |
       | Parent category |  Default for Quiz 1 |

From 6bc8b45c851d4279c3fdb04b0b70a83f93430240 Mon Sep 17 00:00:00 2001
From: Amaia Anabitarte <amaia@moodle.com>
Date: Thu, 9 May 2024 13:32:28 +0200
Subject: [PATCH 74/75] MDL-81601 core_course: Add course index completion
 status behats

---
 .../enable_completion_on_pass_grade.feature   |  2 --
 .../behat/courseindex_completion.feature      | 24 +++++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/completion/tests/behat/enable_completion_on_pass_grade.feature b/completion/tests/behat/enable_completion_on_pass_grade.feature
index 65dbced9ce1c4..cb8b1b182aedd 100644
--- a/completion/tests/behat/enable_completion_on_pass_grade.feature
+++ b/completion/tests/behat/enable_completion_on_pass_grade.feature
@@ -39,8 +39,6 @@ Feature: Students will be marked as completed if they have achieved a passing gr
     When I am on the "Course 1" course page logged in as student1
     Then the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
     And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "failed"
-    And "Failed" "icon" should exist in the "courseindex-content" "region"
     And I am on the "Course 1" course page logged in as student2
     And the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
     And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "done"
-    And "Done" "icon" should exist in the "courseindex-content" "region"
diff --git a/course/format/tests/behat/courseindex_completion.feature b/course/format/tests/behat/courseindex_completion.feature
index fdaa206d84c55..4807f410dcbd0 100644
--- a/course/format/tests/behat/courseindex_completion.feature
+++ b/course/format/tests/behat/courseindex_completion.feature
@@ -108,8 +108,8 @@ Feature: Course index completion icons
       | questioncategory | qtype     | name           | questiontext              |
       | Test questions   | truefalse | First question | Answer the first question |
     And the following "activities" exist:
-      | activity | name           | course | idnumber | attempts | gradepass | completion | completionusegrade | completionpass | completionattemptsexhausted |
-      | quiz     | Test quiz name | C1     | quiz1    | 1        | 5.00      | 2          | 1                  | 1              | 1                           |
+      | activity | name           | course | idnumber | attempts | gradepass | completion | completionusegrade | completionpassgrade | completionattemptsexhausted |
+      | quiz     | Test quiz name | C1     | quiz1    | 1        | 5.00      | 2          | 1                  | 1                   | 1                           |
     And quiz "Test quiz name" contains the following questions:
       | question       | page |
       | First question | 1    |
@@ -118,3 +118,23 @@ Feature: Course index completion icons
       | 1    | True    |
     When I am on the "C1" "Course" page logged in as "student1"
     And "Done" "icon" should exist in the "courseindex-content" "region"
+
+  @javascript
+  Scenario: Completion done should appear in the course index when the requirement is any grade
+    Given the following "question categories" exist:
+      | contextlevel | reference | name           |
+      | Course       | C1        | Test questions |
+    And the following "questions" exist:
+      | questioncategory | qtype     | name           | questiontext              |
+      | Test questions   | truefalse | First question | Answer the first question |
+    And the following "activities" exist:
+      | activity | name           | course | idnumber | attempts | gradepass | completion | completionusegrade | completionpassgrade | completionattemptsexhausted |
+      | quiz     | Test quiz name | C1     | quiz1    | 1        | 5.00      | 2          | 1                  | 0                   | 1                           |
+    And quiz "Test quiz name" contains the following questions:
+      | question       | page |
+      | First question | 1    |
+    And user "student1" has attempted "Test quiz name" with responses:
+      | slot | response |
+      | 1    | False    |
+    When I am on the "C1" "Course" page logged in as "student1"
+    And "Done" "icon" should exist in the "courseindex-content" "region"

From 462d5f04a8fea5e2aaa7911cc700f90d54b8a73b Mon Sep 17 00:00:00 2001
From: Ilya Tregubov <ilya.a.tregubov@gmail.com>
Date: Fri, 10 May 2024 09:09:28 +0800
Subject: [PATCH 75/75] weekly release 4.5dev

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 2513fe1f977b7..c2e0e3d016e9d 100644
--- a/version.php
+++ b/version.php
@@ -29,9 +29,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2024050300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2024051000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
-$release  = '4.5dev (Build: 20240503)'; // Human-friendly version name
+$release  = '4.5dev (Build: 20240510)'; // Human-friendly version name
 $branch   = '405';                     // This version's branch.
 $maturity = MATURITY_ALPHA;             // This version's maturity level.