From 69e1c3ca7a67f872769d958c336cab1279b8097c Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Thu, 25 Jul 2024 17:12:49 +0100
Subject: [PATCH] MDL-82607 filters: configfilternavigationwithsystemcontext on
 by default

---
 admin/settings/plugins.php        | 2 +-
 course/tests/category_test.php    | 3 +++
 lib/tests/context_helper_test.php | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/settings/plugins.php b/admin/settings/plugins.php
index 9604e436a54..12394d3bbea 100644
--- a/admin/settings/plugins.php
+++ b/admin/settings/plugins.php
@@ -287,7 +287,7 @@ if ($hassiteconfig) {
         $items[] = new admin_setting_configcheckbox('filtermatchonepertext', new lang_string('filtermatchonepertext', 'admin'), new lang_string('configfiltermatchonepertext', 'admin'), 0);
         $items[] = new admin_setting_configcheckbox('filternavigationwithsystemcontext',
                 new lang_string('filternavigationwithsystemcontext', 'admin'),
-                new lang_string('configfilternavigationwithsystemcontext', 'admin'), 0);
+                new lang_string('configfilternavigationwithsystemcontext', 'admin'), 1);
         foreach ($items as $item) {
             $item->set_updatedcallback('reset_text_filters_cache');
             $temp->add($item);
diff --git a/course/tests/category_test.php b/course/tests/category_test.php
index f17709fce11..b6eba967d4b 100644
--- a/course/tests/category_test.php
+++ b/course/tests/category_test.php
@@ -1399,6 +1399,9 @@ class category_test extends \advanced_testcase {
         filter_set_global_state('multilang', TEXTFILTER_ON);
         filter_set_applies_to_strings('multilang', true);
 
+        // First test with the performance setting off.
+        set_config('filternavigationwithsystemcontext', 0);
+
         $perf = $filtermanager->get_performance_summary();
         $this->assertEquals(0, $perf[0]['contextswithfilters']);
 
diff --git a/lib/tests/context_helper_test.php b/lib/tests/context_helper_test.php
index 7c42ce2d1c2..62c17c91e9f 100644
--- a/lib/tests/context_helper_test.php
+++ b/lib/tests/context_helper_test.php
@@ -483,9 +483,6 @@ class context_helper_test extends \advanced_testcase {
         $pagecontext = context\module::instance($page->cmid);
         $systemcontext = context\system::instance();
 
-        // Default is OFF.
-        $this->assertSame('0', $CFG->filternavigationwithsystemcontext);
-
         // First test passed values are returned if disabled.
         set_config('filternavigationwithsystemcontext', '0');