Merge branch 'MDL-28186' of git://git.luns.net.uk/moodle

[moodle.git] / lib / navigationlib.php

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 6b4de2d..52011cc 100644 (file)
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -995,7 +995,7 @@ class global_navigation extends navigation_node {
      * is an issue explaining why this is a REALLY UGLY HACK thats not
      * for you to use!
      *
-     * @param int $userid userid of profile page that parent wants to navigate around. 
+     * @param int $userid userid of profile page that parent wants to navigate around.
      */
     public function set_userid_for_parent_checks($userid) {
         $this->useridtouseforparentchecks = $userid;
@@ -1289,7 +1289,7 @@ class global_navigation extends navigation_node {
         }
 
         // If the user is not logged in modify the navigation structure as detailed
-        // in {@link http://docs.moodle.org/en/Development:Navigation_2.0_structure}
+        // in {@link http://docs.moodle.org/dev/Navigation_2.0_structure}
         if (!isloggedin()) {
             $activities = clone($this->rootnodes['site']->children);
             $this->rootnodes['site']->remove();
@@ -1459,7 +1459,7 @@ class global_navigation extends navigation_node {
                         } else {
                             // We should never ever arrive here - if we have then there is a bigger
                             // problem at hand.
-                            throw coding_exception('Category path order is incorrect and/or there are missing categories');
+                            throw new coding_exception('Category path order is incorrect and/or there are missing categories');
                         }
                     }
                 }
@@ -1817,7 +1817,9 @@ class global_navigation extends navigation_node {
             } else {
                 // This is the site so add a users node to the root branch
                 $usersnode = $this->rootnodes['users'];
-                $usersnode->action = new moodle_url('/user/index.php', array('id'=>$course->id));
+                if (has_capability('moodle/course:viewparticipants', $coursecontext)) {
+                    $usersnode->action = new moodle_url('/user/index.php', array('id'=>$course->id));
+                }
                 $userviewurl = new moodle_url('/user/profile.php', $baseargs);
             }
             if (!$usersnode) {