From e372ff7141cb170f97833e26415640379b9d2459 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Sat, 3 Jul 2010 18:18:45 -0400 Subject: [PATCH] fix timezone determination when user's timezone pref is empty/default. --- timeobjects/lib/Driver/FacebookEvents.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/timeobjects/lib/Driver/FacebookEvents.php b/timeobjects/lib/Driver/FacebookEvents.php index 0419d70cc..d6921e274 100644 --- a/timeobjects/lib/Driver/FacebookEvents.php +++ b/timeobjects/lib/Driver/FacebookEvents.php @@ -46,10 +46,12 @@ class TimeObjects_Driver_FacebookEvents // change it, who knows. $event['start_time'] -= 21600; //60 * 60 * 6; $start = new Horde_Date($event['start_time'], 'America/Los_Angeles'); - $start->setTimezone($GLOBALS['prefs']->getValue('timezone', date_default_timezone_get())); + $tz = $GLOBALS['prefs']->getValue('timezone'); + + $start->setTimezone(empty($tz) ? date_default_timezone_get() : $tz); $event['end_time'] -= 21600; $end = new Horde_Date($event['end_time'], 'America/Los_Angeles'); - $end->setTimezone($GLOBALS['prefs']->getValue('timezone', date_default_timezone_get())); + $end->setTimezone(empty($tz) ? date_default_timezone_get() : $tz); $objects[] = array('id' => $event['eid'], 'title' => $event['name'] . ' - ' . $event['tagline'], -- 2.11.0