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

2012-04-16 13:29:07 +08:00
parent d2db892076 bd8d0b81d6
commit afa1de62b2
1 changed files with 4 additions and 1 deletions
@@ -2375,7 +2375,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();