Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
integration
prechecker
Commits
d470de67
Commit
d470de67
authored
Nov 27, 2017
by
jun
Browse files
Merge branch 'MDL-58887-master' of
git://github.com/ryanwyllie/moodle
parents
29abde47
05df02a0
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/outputcomponents.php
View file @
d470de67
...
...
@@ -4464,7 +4464,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
)
:
''
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment