mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-17 22:45:54 +02:00
Code Issues Projects Releases Wiki Activity

MDL-74498 output: Resolve correct icon for modules

Browse Source 
Fixes the resolve_image_location function, which previously returned
the 'icon' or 'monologo' icon for modules, no matter the requested
image name.

Also fixes an incorrect pix_icon() call for the context header, which
was hidden by the faulty resolve function.
This commit is contained in:
Justus Dieckmann 2022-04-14 00:40:38 +02:00
parent 5423e5f443
commit bf68b2bc64
2 changed files with 11 additions and 9 deletions
lib
outputlib.php
theme/boost/classes/output
core_renderer.php

18
lib/outputlib.php

@ -2112,15 +2112,17 @@ class theme_config {
$candidates = [$image];
if ($type === 'mod') {
if ($image === 'icon') {
debugging(
"The 'icon' image for activity modules has been replaced with a new 'monologo'. " .
"Please update your calling code to fetch the new icon where possible. " .
"Called for component {$component}.",
DEBUG_DEVELOPER
);
if ($image === 'icon' || $image === 'monologo') {
$candidates = ['monologo', 'icon'];
if ($image === 'icon') {
debugging(
"The 'icon' image for activity modules has been replaced with a new 'monologo'. " .
"Please update your calling code to fetch the new icon where possible. " .
"Called for component {$component}.",
DEBUG_DEVELOPER
);
}
}
$candidates = ['monologo', 'icon'];
}
foreach ($candidates as $image) {
if ($imagefile = $this->image_exists("$this->dir/pix_plugins/$type/$plugin/$image", $svg)) {

2
theme/boost/classes/output/core_renderer.php

@ -154,7 +154,7 @@ class core_renderer extends \core_renderer {
$heading = $this->page->course->fullname;
} else {
$heading = $this->page->cm->get_formatted_name();
$imagedata = $this->pix_icon('monologo.icon', '', $this->page->activityname, ['class' => 'activityicon']);
$imagedata = $this->pix_icon('monologo', '', $this->page->activityname, ['class' => 'activityicon']);
$purposeclass = plugin_supports('mod', $this->page->activityname, FEATURE_MOD_PURPOSE);
$purposeclass .= ' activityiconcontainer';
$purposeclass .= ' modicon_' . $this->page->activityname;