--- /Users/daniele/Sites/moodle18/course/viewORIG.php	2007-04-18 04:31:36.000000000 +0200
+++ /Users/daniele/Sites/moodle18/course/view.php	2007-06-11 16:18:07.000000000 +0200
@@ -18,7 +18,7 @@
     $move        = optional_param('move', 0, PARAM_INT);
     $marker      = optional_param('marker',-1 , PARAM_INT);
     $switchrole  = optional_param('switchrole',-1, PARAM_INT);
-
+    $parent      = optional_param('parent','' , PARAM_RAW);
 
 
     if (empty($id) && empty($name) && empty($idnumber)) {
@@ -65,7 +65,23 @@
         }
     }
 
-
+    if (!empty($parent)) {
+        if (! ($parentcourse = get_record('course', 'id', $parent)) ) {
+            error('Invalid parent course id');
+	        unset($parent);
+        } else {
+	        $SESSION->parent = $parentcourse->shortname;
+	        $SESSION->parentlink = $CFG->wwwroot.'/course/view.php?id='.$parent;
+       	    //$parentlink = array($parentcourse->shortname => $CFG->wwwroot.'/course/view.php?id='.$parent);
+	    }
+    } else {
+        // check if this is a metacourse and if not clear stale SESSION info
+   	    if (! ($subcourse = get_record('course_meta','parent_course',$course->id))) {
+	        $SESSION->parent = '';
+	        $SESSION->parentlink = '';
+        }
+    }
+    
     require_once($CFG->dirroot.'/calendar/lib.php');    /// This is after login because it needs $USER
 
     add_to_log($course->id, 'course', 'view', "view.php?id=$course->id", "$course->id");
@@ -170,8 +186,7 @@
 
     $CFG->blocksdrag = $CFG->useajax;   // this will add a new class to the header so we can style differently
 
-
-    $PAGE->print_header(get_string('course').': %fullname%', NULL, '', $bodytags);
+    $PAGE->print_header(get_string('course').': %fullname%', '', '', $bodytags);
     // Course wrapper start.
     echo '<div class="course-content">';