Merge branch 'MDL-48088-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE

2014-12-22 13:07:48 +00:00
parent cd56eaff2e 1b514458f6
commit 9752358c50
1 changed files with 4 additions and 0 deletions
@@ -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;
    }