Merge branch 'wip-MDL-31463-MOODLE_21_STABLE' of git://github.com/abg…

…reeve/moodle into MOODLE_21_STABLE
moodle · Feb 13, 2012 · 7b53f78 · 7b53f78
2 parents 38b0b25 + 65c29e2
commit 7b53f78
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
@@ -1928,7 +1928,8 @@ protected function load_for_user($user=null, $forceforcontext=false) {
                 return false;
             }
             // Add a branch for the current user
-            $usernode = $usersnode->add(fullname($user, true), $userviewurl, self::TYPE_USER, null, $user->id);
+            $canseefullname = has_capability('moodle/site:viewfullnames', $coursecontext);
+            $usernode = $usersnode->add(fullname($user, $canseefullname), $userviewurl, self::TYPE_USER, null, $user->id);
 
             if ($this->page->context->contextlevel == CONTEXT_USER && $user->id == $this->page->context->instanceid) {
                 $usernode->make_active();