MDL-57284 boost: Fix booktool_print icons

2016-12-06 15:50:57 +00:00
parent d4feb70e17
commit 2fbe4fca87
1 changed files with 4 additions and 0 deletions
@@ -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);
                    }