From 2451c06a397ee89c3a051703fae8f479573beb83 Mon Sep 17 00:00:00 2001 From: eileenmcnaugton Date: Mon, 14 Mar 2016 22:19:26 +1300 Subject: [PATCH] CRM-18232 Handle 'etc/UTF' timezone --- CRM/Utils/System/Base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php index 292d18fa52..b3f8dcb443 100644 --- a/CRM/Utils/System/Base.php +++ b/CRM/Utils/System/Base.php @@ -691,7 +691,7 @@ abstract class CRM_Utils_System_Base { public function getTimeZoneOffset() { $timezone = $this->getTimeZoneString(); if ($timezone) { - if ($timezone == 'UTC') { + if ($timezone == 'UTC' || $timezone == 'Etc/UTC') { // CRM-17072 Let's short-circuit all the zero handling & return it here! return '+00:00'; } -- 2.25.1