From: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Mon, 14 Mar 2016 09:19:26 +0000 (+1300)
Subject: CRM-18232 Handle 'etc/UTF' timezone
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2451c06a397ee89c3a051703fae8f479573beb83;p=civicrm-core.git

CRM-18232 Handle 'etc/UTF' timezone
---

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';
       }