Merge branch 'MDL-48088-master' of git://github.com/jethac/moodle

NoelDeMartin · Dec 22, 2014 · 0a6ac6e · 0a6ac6e
2 parents c67c00a + 08a4f93
commit 0a6ac6e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/calendar/lib.php b/calendar/lib.php
@@ -1931,6 +1931,9 @@ function calendar_normalize_tz($tz) {
         case('Japan Standard Time'):
             $tz = 'Asia/Tokyo';
             break;
+        case('Romance Standard Time'):
+            $tz = 'Europe/Brussels';
+            break;
     }
     return $tz;
 }
@@ -2971,6 +2974,7 @@ function calendar_add_icalendar_event($event, $courseid, $subscriptionid, $timez
     } else {
         $endtz = isset($event->properties['DTEND'][0]->parameters['TZID']) ? $event->properties['DTEND'][0]->parameters['TZID'] :
                 $timezone;
+        $endtz = calendar_normalize_tz($endtz);
         $eventrecord->timeduration = strtotime($event->properties['DTEND'][0]->value . ' ' . $endtz) - $eventrecord->timestart;
     }