MDL-10353, calender redirection broken when editting and exporting

diff --git a/calendar/export.php b/calendar/export.php
index c97dd274c230661fc5db3df4e02b1277dee55b68..37a2cbf6114da59b2ccea1e71aa115bd1f0fefda 100644 (file)
--- a/calendar/export.php
+++ b/calendar/export.php
@@ -9,12 +9,7 @@ $action = optional_param('action', '', PARAM_ALPHA);
 $day  = optional_param('cal_d', 0, PARAM_INT);
 $mon  = optional_param('cal_m', 0, PARAM_INT);
 $yr   = optional_param('cal_y', 0, PARAM_INT);
-
-if (isset($SESSION->cal_course_referer)) {
-    $course = $SESSION->cal_course_referer;
-} else {
-    $course = optional_param('course', 0, PARAM_INT);
-}
+$courseid = optional_param('course', 0, PARAM_INT);
 
 require_login();
 
@@ -43,8 +38,12 @@ if(!checkdate($mon, $day, $yr)) {
 }
 $time = make_timestamp($yr, $mon, $day);
 
-$SESSION->cal_courses_shown = calendar_get_default_courses(true);
-calendar_set_referring_course(0);
+if (empty($USER->id) or isguest()) {
+    $defaultcourses = calendar_get_default_courses();
+    calendar_set_filters($courses, $groups, $users, $defaultcourses, $defaultcourses);
+} else {
+    calendar_set_filters($courses, $groups, $users);
+}
 
 if (empty($USER->id) or isguest()) {
     $defaultcourses = calendar_get_default_courses();

diff --git a/calendar/view.php b/calendar/view.php
index 3e382199cc655b0de5188c0b80619d5291f64226..506903488fccd5a7655333a278a952c42f720114 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -607,6 +607,7 @@ function calendar_show_upcoming_events($courses, $groups, $users, $futuredays, $
 
         echo '<div class="eventlist">';
         foreach ($events as $event) {
+            $event->calendarcourseid = $courseid;
             calendar_print_event($event);
         }
         echo '</div>';