Merge branch 'MDL-25991_actionnav' of github.com:skodak/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 07:57:58 +0000 (08:57 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 07:57:58 +0000 (08:57 +0100)
lib/outputrenderers.php

index bbcad53..3231669 100644 (file)
@@ -2409,12 +2409,12 @@ EOD;
             return '';
         }
         if ($item->action instanceof action_link) {
-            //TODO: to be replaced with something else
             $link = $item->action;
             if ($item->hidden) {
                 $link->add_class('dimmed');
             }
-            $content = $this->output->render($link);
+            $link->text = $content.$link->text; // add help icon
+            $content = $this->render($link);
         } else if ($item->action instanceof moodle_url) {
             $attributes = array();
             if ($title !== '') {