mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-18 23:15:38 +02:00
Code Issues Projects Releases Wiki Activity

MDL-83353 output: fix icon output in classic activity navigation.

Browse Source 
Prevent `$PAGE` debugging when loading navigation branches.
This commit is contained in:
Paul Holden 2024-10-03 10:12:39 +01:00
parent 0eacab846e
commit 8d318b1b05
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ajax/getnavbranch.php
View File

@ -49,6 +49,7 @@ try {
// This identifies the block instance requesting AJAX extension
$instanceid = optional_param('instance', null, PARAM_INT);
$PAGE->set_url(new moodle_url('/lib/ajax/getnavbranch.php'));
$PAGE->set_context(context_system::instance());
// Create a global nav object

2
lib/navigationlib.php
View File

@ -2462,7 +2462,7 @@ class global_navigation extends navigation_node {
$icon = new pix_icon(
$activitydata->icon ?: 'monologo',
get_string('modulename', $activitydata->modname),
$activitydata->modname
$activitydata->icon ? $activitydata->iconcomponent : $activitydata->modname,
);
// Prepare the default name and url for the node.