navigation MDL-20235 Ignored active path for site course when in user context

diff --git a/user/index.php b/user/index.php
index d0f8949417e0ce1bf1a6e1dbe5e6363252d0fd79..eaf98ff4e7ee82fa5eff5624ffc7c58505ac4d1b 100644 (file)
--- a/user/index.php
+++ b/user/index.php
@@ -158,6 +158,10 @@
 
     $isseparategroups = ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context));
 
+    if ($course->id===SITEID) {
+        $PAGE->navbar->ignore_active();
+    }
+
     $PAGE->navbar->add(get_string('participants'));
     $PAGE->set_title("$course->shortname: ".get_string('participants'));
     $PAGE->set_heading($course->fullname);

diff --git a/user/view.php b/user/view.php
index 509d2351ba9b4c4782911aef46dfcb9bc34d32f7..37e07871e7c7d31cd667d86d707cf436e36533c1 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -78,7 +78,9 @@
     if (has_capability('moodle/course:viewparticipants', $coursecontext) || has_capability('moodle/site:viewparticipants', $systemcontext)) {
         $link = new moodle_url($CFG->wwwroot."/user/index.php", array('id'=>$course->id));
     }
-    $PAGE->navbar->ignore_active();
+    if ($course->id===SITEID) {
+        $PAGE->navbar->ignore_active();
+    }
     $PAGE->navbar->add($strparticipants, $link);
 
 /// If the user being shown is not ourselves, then make sure we are allowed to see them!