calendar MDL-24284 Fixed up URL param encoding issue

anovikov · Sep 20, 2010 · 0f927f1 · 0f927f1
1 parent 7c61b94
commit 0f927f1
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 102 deletions.
diff --git a/calendar/delete.php b/calendar/delete.php
@@ -120,7 +120,7 @@
 echo $OUTPUT->box_end();
 
 // Print the event so that people can visually confirm they have the correct event
-$event->time = calendar_format_event_time($event, time(), '', false);
+$event->time = calendar_format_event_time($event, time(), null, false);
 calendar_print_event($event, false);
 
 echo $OUTPUT->box_end();

diff --git a/calendar/export.php b/calendar/export.php
@@ -123,9 +123,8 @@
 $prefsbutton = calendar_preferences_button();
 
 // Print title and header
-$link = calendar_get_link_href(CALENDAR_URL.'view.php?view=upcoming&amp;course='.$calendar->courseid.'&amp;',
-                                   $now['mday'], $now['mon'], $now['year']);
-$PAGE->navbar->add(get_string('calendar', 'calendar'), new moodle_url($link));
+$link = new moodle_url(CALENDAR_URL.'view.php', array('view'=>'upcoming', 'course'=>$calendar->courseid));
+$PAGE->navbar->add(get_string('calendar', 'calendar'), calendar_get_link_href($link, $now['mday'], $now['mon'], $now['year']));
 $PAGE->navbar->add($pagetitle);
 
 $PAGE->set_title($site->shortname.': '.$strcalendar.': '.$pagetitle);