From f42860f4b00797d65471746d7f0e65e50fc67012 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Mon, 3 Oct 2016 08:51:47 +1300
Subject: [PATCH] Prevent "DateTimeZone::__construct(): Unknown or bad timezone
(UTC-5)" during upgrade by simply ignoring the whole error
---
core/Updates/2.16.3-b3.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/core/Updates/2.16.3-b3.php b/core/Updates/2.16.3-b3.php
index a1175c9f4d..4d28615f6f 100644
--- a/core/Updates/2.16.3-b3.php
+++ b/core/Updates/2.16.3-b3.php
@@ -34,7 +34,11 @@ class Updates_2_16_3_b3 extends PiwikUpdates
protected function adjustTimezoneBySite($hour, $idSite)
{
$timezone = Site::getTimezoneFor($idSite);
- $dateTimeZone = new \DateTimeZone($timezone);
+ try {
+ $dateTimeZone = new \DateTimeZone($timezone);
+ } catch(\Exception $e) {
+ return;
+ }
$timeZoneDifference = -ceil($dateTimeZone->getOffset(new \DateTime()) / 3600);
return (24 + $hour + $timeZoneDifference) % 24;
}
--
GitLab