mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 07:56:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-57284-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-12-06 15:50:36 +00:00
commit b864c7fa1d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
theme/boost/classes/output/core_renderer.php
View File

@ -732,6 +732,10 @@ class core_renderer extends \core_renderer {
if ($menuitem->action) {
if ($menuitem->action instanceof action_link) {
$link = $menuitem->action;
// Give preference to setting icon over action icon.
if (!empty($menuitem->icon)) {
$link->icon = $menuitem->icon;
}
} else {
$link = new action_link($menuitem->action, $menuitem->text, null, null, $menuitem->icon);
}