Merge branch 'MDL-58887-33' of git://github.com/ryanwyllie/moodle into MOODLE_33_STABLE

2017-11-27 15:06:19 +13:00
parent 319e12ba83 25bb7e4a12
commit 813baed84d
1 changed files with 3 additions and 1 deletions
@@ -4460,7 +4460,9 @@ class action_menu implements renderable, templatable {

        if ($actionicon instanceof pix_icon) {
            $primary->icon = $actionicon->export_for_pix();
-            $primary->title = !empty($actionicon->attributes['alt']) ? $this->actionicon->attributes['alt'] : '';
+            if (!empty($actionicon->attributes['alt'])) {
+                $primary->title = $actionicon->attributes['alt'];
+            }
        } else {
            $primary->iconraw = $actionicon ? $output->render($actionicon) : '';
        }