Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'MDL-31348' of git://github.com/danpoltawski/moodle into…

… MOODLE_22_STABLE
  • Loading branch information...
commit 0d40a799e5d090f6f22069705fadb97d385459a6 2 parents 5775c7e + b69337e
Eloy Lafuente (stronk7) authored February 27, 2012
6  calendar/delete.php
@@ -68,8 +68,8 @@
68 68
 
69 69
 // Is used several times, and sometimes with modification if required
70 70
 $viewcalendarurl = new moodle_url(CALENDAR_URL.'view.php', array('view'=>'upcoming'));
71  
-$viewcalendarurl->param('cal_y', date('Y', $event->timestart));
72  
-$viewcalendarurl->param('cal_m', date('m', $event->timestart));
  71
+$viewcalendarurl->param('cal_y', userdate($event->timestart, '%Y'));
  72
+$viewcalendarurl->param('cal_m', userdate($event->timestart, '%m'));
73 73
 
74 74
 // If confirm is set (PARAM_BOOL) then we have confirmation of initention to delete
75 75
 if ($confirm) {
@@ -124,4 +124,4 @@
124 124
 calendar_print_event($event, false);
125 125
 
126 126
 echo $OUTPUT->box_end();
127  
-echo $OUTPUT->footer();
  127
+echo $OUTPUT->footer();
6  calendar/event.php
@@ -168,9 +168,9 @@
168 168
 
169 169
     $params = array(
170 170
         'view' => 'day',
171  
-        'cal_d' => date('j', $event->timestart),
172  
-        'cal_m' => date('n', $event->timestart),
173  
-        'cal_y' => date('y', $event->timestart),
  171
+        'cal_d' => userdate($event->timestart, '%d'),
  172
+        'cal_m' => userdate($event->timestart, '%m'),
  173
+        'cal_y' => userdate($event->timestart, '%Y'),
174 174
     );
175 175
     $eventurl = new moodle_url('/calendar/view.php', $params);
176 176
     if (!empty($event->courseid) && $event->courseid != SITEID) {

0 notes on commit 0d40a79

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