CRM-17326 add isset check to timezone retrieval

This addresses an e-notice

Change-Id: I82d3314bc2e28cca64ec9f4ed4d64477c50b7303

diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php
index d189ddd55c54e3bd3969c80bddb6749fa094685a..f98b0a2ebe48c9d362310cf18d085e8dddd52b49 100644 (file)
--- a/CRM/Utils/System/Drupal.php
+++ b/CRM/Utils/System/Drupal.php
@@ -764,7 +764,8 @@ AND    u.status = 1
    */
   public function getTimeZoneString() {
     global $user;
-    if (variable_get('configurable_timezones', 1) && $user->uid && strlen($user->timezone)) {
+    // Note that 0 is a valid timezone (GMT) so we use strlen not empty to check.
+    if (variable_get('configurable_timezones', 1) && $user->uid && isset($user->timezone) && strlen($user->timezone)) {
       $timezone = $user->timezone;
     }
     else {

diff --git a/CRM/Utils/System/Drupal6.php b/CRM/Utils/System/Drupal6.php
index 3e970558608a8fef4cae760d0d787bd1c356a414..60da7ae2c4e4c12d8bd37ec9776b38619fc381a8 100644 (file)
--- a/CRM/Utils/System/Drupal6.php
+++ b/CRM/Utils/System/Drupal6.php
@@ -726,7 +726,8 @@ class CRM_Utils_System_Drupal6 extends CRM_Utils_System_DrupalBase {
    */
   public function getTimeZoneString() {
     global $user;
-    if (variable_get('configurable_timezones', 1) && $user->uid && strlen($user->timezone)) {
+    // Note that 0 is a valid timezone (GMT) so we use strlen not empty to check.
+    if (variable_get('configurable_timezones', 1) && $user->uid && isset($user->timezone) && strlen($user->timezone)) {
       $timezone = $user->timezone;
     }
     else {