From dc606a57a76bf40ed7dd6170a9d195030f8606fe Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Thu, 30 Jan 2014 09:39:11 +1300
Subject: [PATCH] MLD-28567 calendar: improved course filter process

---
 calendar/renderer.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/calendar/renderer.php b/calendar/renderer.php
index 1a87d58eaeb..2a86b03d6ab 100644
--- a/calendar/renderer.php
+++ b/calendar/renderer.php
@@ -715,7 +715,8 @@ class core_calendar_renderer extends plugin_renderer_base {
     /**
      * Displays a course filter selector
      *
-     * @param array $getvars
+     * @param moodle_url $returnurl The URL that the user should be taken too upon selecting a course.
+     * @param string $label The label to use for the course select.
      * @return string
      */
     protected function course_filter_selector(moodle_url $returnurl, $label=null) {
@@ -745,7 +746,9 @@ class core_calendar_renderer extends plugin_renderer_base {
         } else {
             $selected = '';
         }
-        $select = new single_select(new moodle_url(CALENDAR_URL.'set.php', array('return' => base64_encode($returnurl->out(false)), 'var' => 'setcourse', 'sesskey'=>sesskey())), 'id', $courseoptions, $selected, null);
+        $courseurl = new moodle_url($returnurl);
+        $courseurl->remove_params('course');
+        $select = new single_select($courseurl, 'course', $courseoptions, $selected, null);
         $select->class = 'cal_courses_flt';
         if ($label !== null) {
             $select->set_label($label);
@@ -855,4 +858,4 @@ class core_calendar_renderer extends plugin_renderer_base {
         $html .= html_writer::end_tag('form');
         return $html;
     }
-}
\ No newline at end of file
+}