From 9c2a7b8f2965adc322e74c7d6262e754aaae833d Mon Sep 17 00:00:00 2001 From: Jim Hu Date: Sun, 12 Nov 2006 08:06:30 +0000 Subject: roll back experimental feature --- functions/date_functions.php | 2 +- functions/init.inc.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'functions') diff --git a/functions/date_functions.php b/functions/date_functions.php index 9c9bc30..83e51af 100644 --- a/functions/date_functions.php +++ b/functions/date_functions.php @@ -244,7 +244,7 @@ function extractDateTime($data, $property, $field) { // Pull out the timezone, or use GMT if zulu time was indicated. if (preg_match('/^'.$property.';TZID=/i', $field)) { $tz_tmp = explode('=', $field); - $tz_dt = $tz_tmp[1]; + $tz_dt = parse_tz($tz_tmp[1]); unset($tz_tmp); } elseif ($zulu_time) { $tz_dt = 'GMT'; diff --git a/functions/init.inc.php b/functions/init.inc.php index c554f81..83b540e 100644 --- a/functions/init.inc.php +++ b/functions/init.inc.php @@ -13,7 +13,6 @@ $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'; // Pull in the configuration and some functions. if (!defined('BASE')) define('BASE', './'); -include_once(BASE.'default_config.inc.php'); include_once(BASE.'config.inc.php'); $cookie_name = 'phpicalendar_'.basename($default_path); -- cgit v1.2.3