Commit 788c5164 authored by Dan Poltawski's avatar Dan Poltawski
Browse files

Merge branch 'wip-MDL-32393-m23' of git://github.com/samhemelryk/moodle

parents 9f31cf9f 0064f3cf
......@@ -2511,7 +2511,10 @@ EOD;
if ($item->hidden) {
$link->add_class('dimmed');
}
$link->text = $content.$link->text; // add help icon
if (!empty($content)) {
// Providing there is content we will use that for the link content.
$link->text = $content;
}
$content = $this->render($link);
} else if ($item->action instanceof moodle_url) {
$attributes = array();
......@@ -2896,4 +2899,4 @@ class core_renderer_ajax extends core_renderer {
* @param string $id
*/
public function heading($text, $level = 2, $classes = 'main', $id = null) {}
}
\ No newline at end of file
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment