CRM-18232 Handle 'etc/UTF' timezone

diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php
index 292d18fa529f0eb49e62ef755fa841837ea34c04..b3f8dcb4435bd0d70dadc74ea61f3787d5e7960f 100644 (file)
--- 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';
       }