From: samhemelryk <samhemelryk>
Date: Fri, 4 Sep 2009 03:58:05 +0000 (+0000)
Subject: navigation MDL-20218 global_navigation::load_for_user now looks for course id from... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=05c039e564a2e9524f88135a186af97aafea651f;p=moodle.git

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

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index ee13d52f05..cd55668983 100644
--- 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));
         }