CRM-14148 fix half hour timezones for d7

Fix on previous patch on d6 version

diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php
index 6e41423360fa8c01856316fba9952052d133b34c..5f757822c177c560888463990e6a470da84bc4d4 100644 (file)
--- a/CRM/Utils/System/Drupal.php
+++ b/CRM/Utils/System/Drupal.php
@@ -982,7 +982,7 @@ AND    u.status = 1
       return false;
     }
 
-    $timeZoneOffset = sprintf("%02d:%02d", $tz / 3600, ($tz/60)%60 );
+    $timeZoneOffset = sprintf("%02d:%02d", $tz / 3600, abs(($tz/60)%60));
 
     if($timeZoneOffset > 0){
       $timeZoneOffset = '+' . $timeZoneOffset;

diff --git a/CRM/Utils/System/Drupal6.php b/CRM/Utils/System/Drupal6.php
index 54bc32d49e20deebbf33ab2caff8b1ab25807ea4..e16e61bbdee3bfc81bf99612063928036f754f9a 100644 (file)
--- a/CRM/Utils/System/Drupal6.php
+++ b/CRM/Utils/System/Drupal6.php
@@ -956,7 +956,7 @@ class CRM_Utils_System_Drupal6 extends CRM_Utils_System_DrupalBase {
       return false;
     }
     $hour = $user->timezone / 3600;
-    $timeZoneOffset = sprintf("%02d:%02d", $timezone / 3600, ($timezone/60)%60 );
+    $timeZoneOffset = sprintf("%02d:%02d", $timezone / 3600, abs(($timeZoneOffset/60)%60));
     if($timeZoneOffset > 0){
       $timeZoneOffset = '+' . $timeZoneOffset;
     }