navigation MDL-20218 global_navigation::load_for_user now looks for course id from...

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index ee13d52f05a2d1762c87bdbbed8f8b890ebe6bd9..cd5566898323c0f36222f9162449648b8432f431 100644 (file)
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -815,8 +815,12 @@ class global_navigation extends navigation_node {
      * This gets called by {@link initialise()} when the context is CONTEXT_USER
      */
     protected function load_for_user() {
-        global $DB, $SITE;
-        $courseid = optional_param('course', false, PARAM_INT);
+        global $DB, $SITE, $PAGE;
+        if (!empty($PAGE->course->id)) {
+            $courseid = $PAGE->course->id;
+        } else {
+            $courseid = optional_param('course', false, PARAM_INT);
+        }
         if ($courseid!==false && $courseid!=$SITE->id) {
             $course = $DB->get_record('course', array('id'=>$courseid));
         }