MDL-32393 navigation: Fixed up issue when rendering action_link instances for the navigation

2012-04-16 17:12:48 +12:00
parent 9ad535c550
commit 0064f3cfbb
1 changed files with 5 additions and 2 deletions
@@ -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) {}
-}
+}