Merge branch MDL-29187-m21 of git://github.com/samhemelryk/moodle

- resolved conflict.
2011-09-13 13:54:43 +08:00
parent 995b4d16cd 5da6f4eeb6
commit 6519a7769d
11 changed files with 32 additions and 21 deletions
@@ -3578,7 +3578,7 @@ function print_context_name($context, $withprefix = true, $short = false) {
                if ($withprefix){
                    $name = get_string('category').': ';
                }
-                $name .=format_string($category->name);
+                $name .= format_string($category->name, true, array('context' => $context));
            }
            break;