moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-83786-main' of https://github.com/andrewnicols/moodle

Browse source
This commit is contained in:
Huong Nguyen 2024-11-25 14:34:25 +07:00
commit 86c1eaa4ef
No known key found for this signature in database
GPG key ID: 40D88AB693A3E72A
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/classes/output/core_renderer.php
View file

@ -3489,7 +3489,7 @@ EOD;
} }
// If filtering of the primary custom menu is enabled, apply only the string filters. // If filtering of the primary custom menu is enabled, apply only the string filters.
if (!empty($CFG->navfilter && !empty($CFG->stringfilters))) { if (!empty($CFG->navfilter) && !empty($CFG->stringfilters)) {
// Apply filters that are enabled for Content and Headings. // Apply filters that are enabled for Content and Headings.
$filtermanager = \filter_manager::instance(); $filtermanager = \filter_manager::instance();
$custommenuitems = $filtermanager->filter_string($custommenuitems, \context_system::instance()); $custommenuitems = $filtermanager->filter_string($custommenuitems, \context_system::instance());
@ -3512,7 +3512,7 @@ EOD;
} }
// If filtering of the primary custom menu is enabled, apply only the string filters. // If filtering of the primary custom menu is enabled, apply only the string filters.
if (!empty($CFG->navfilter && !empty($CFG->stringfilters))) { if (!empty($CFG->navfilter) && !empty($CFG->stringfilters)) {
// Apply filters that are enabled for Content and Headings. // Apply filters that are enabled for Content and Headings.
$filtermanager = \filter_manager::instance(); $filtermanager = \filter_manager::instance();
$custommenuitems = $filtermanager->filter_string($custommenuitems, \context_system::instance()); $custommenuitems = $filtermanager->filter_string($custommenuitems, \context_system::instance());