Skip to content
Browse files

Merging fix from HEAD for the recently introduced regression

(incorrent usage of optional_parameter())
  • Loading branch information...
1 parent 48da6c3 commit a9615e79cc3985a2dba3f6bc5423bcdc2c9d4ead defacer committed
Showing with 4 additions and 7 deletions.
  1. +4 −7 calendar/view.php
View
11 calendar/view.php
@@ -56,13 +56,10 @@
$nav = calendar_get_link_tag(get_string('calendar', 'calendar'), CALENDAR_URL.'view.php?view=upcoming&', $now['mday'], $now['mon'], $now['year']);
- optional_param('view', 'upcoming');
- optional_param('cal_d', 0, PARAM_INT);
- optional_param('cal_m', 0, PARAM_INT);
- optional_param('cal_y', 0, PARAM_INT);
- $day = $cal_d;
- $mon = $cal_m;
- $yr = $cal_y;
+ $view = optional_param('view', 'upcoming');
+ $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(!checkdate($mon, $day, $yr)) {
$day = intval($now['mday']);

0 comments on commit a9615e7

Please sign in to comment.
Something went wrong with that request. Please try again.