--- 196_unmodified/calendar/lib.php	2008-05-01 08:16:18.000000000 -0700
+++ 196/calendar/lib.php	2009-12-22 15:39:57.894649100 -0800
@@ -696,7 +696,10 @@
     // Ensure course id passed if relevant
     // Required due to changes in view/lib.php mainly (calendar_session_vars())
     $courseid = '';
-    if (!empty($data['id'])) {
+    if (!empty($data['courseid'])) {
+        $courseid = '&course='.$data['courseid'];
+    }
+    else if (!empty($data['id'])) {
         $courseid = '&course='.$data['id'];
     }
 
@@ -729,8 +732,13 @@
         case 'course':
             list($prevmonth, $prevyear) = calendar_sub_month($data['m'], $data['y']);
             list($nextmonth, $nextyear) = calendar_add_month($data['m'], $data['y']);
-            $nextlink = calendar_get_link_next(get_string('monthnext', 'access'), 'view.php?id='.$data['id'].'&', 0, $nextmonth, $nextyear, $accesshide=true);
-            $prevlink = calendar_get_link_previous(get_string('monthprev', 'access'), 'view.php?id='.$data['id'].'&', 0, $prevmonth, $prevyear, true);
+            if (isset($data['id']) && $data['id'] != 0) {
+                $nextlink = calendar_get_link_next(get_string('monthnext', 'access'), $data['pagename'].'?id='.$data['id'].'&', 0, $nextmonth, $nextyear, $accesshide=true);
+                $prevlink = calendar_get_link_previous(get_string('monthprev', 'access'), $data['pagename'].'?id='.$data['id'].'&', 0, $prevmonth, $prevyear, true);
+            } else {
+                $nextlink = calendar_get_link_next(get_string('monthnext', 'access'), $data['pagename'].'?'.$data['paramname'].'='.$data['paramval'].'&', 0, $nextmonth, $nextyear, $accesshide=true);
+                $prevlink = calendar_get_link_previous(get_string('monthprev', 'access'), $data['pagename'].'?'.$data['paramname'].'='.$data['paramval'].'&', 0, $prevmonth, $prevyear, true);
+            }
             $content .= "\n".'<div class="calendar-controls">'. $prevlink;
             $content .= '<span class="hide"> | </span><span class="current"><a href="'.calendar_get_link_href(CALENDAR_URL.'view.php?view=month'.$courseid.'&amp;', 1, $data['m'], $data['y']).'">'.userdate($time, get_string('strftimemonthyear')).'</a></span>';
             $content .= '<span class="hide"> | </span>'. $nextlink ."\n";