From 9c1ad1c80dbdf3cfa73477437c33fb821a0424b8 Mon Sep 17 00:00:00 2001 From: Jim Hu Date: Mon, 26 Jan 2009 03:27:29 +0000 Subject: misc changes for 2.31 --- functions/calendar_functions.php | 2 ++ functions/ical_parser.php | 2 +- functions/init/set_error_reporting.php | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'functions') diff --git a/functions/calendar_functions.php b/functions/calendar_functions.php index 2362686..25ec8ed 100644 --- a/functions/calendar_functions.php +++ b/functions/calendar_functions.php @@ -101,6 +101,8 @@ function availableCalendars($username, $password, $cal_filename, $admin = false) if (!is_file($file)) continue; // Remove any php files. if (preg_match("/^.*\.php$/i", $file)) continue; + # remove publish log file + if ($file == 'publish_log.txt') continue; // Make sure this is not a blacklisted calendar. $cal_name = getCalendarName($file); if (in_array($cal_name, $blacklisted_cals)) continue; diff --git a/functions/ical_parser.php b/functions/ical_parser.php index 70f3593..3776e55 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -19,7 +19,7 @@ if ($phpiCal_config->save_parsed_cals == 'yes') { $master_array = unserialize($contents); $z=1; $y=0; - $webcal_mtime = time() - ($webcal_hours * 3600); + $webcal_mtime = time() - ($phpiCal_config->webcal_hours * 3600); if (sizeof($master_array['-4']) == (sizeof($cal_filelist))) { foreach ($master_array['-4'] as $temp_array) { $mtime = $master_array['-4'][$z]['mtime']; diff --git a/functions/init/set_error_reporting.php b/functions/init/set_error_reporting.php index b57040e..9265c86 100644 --- a/functions/init/set_error_reporting.php +++ b/functions/init/set_error_reporting.php @@ -4,7 +4,7 @@ config boolean $verbose_errors = false by default */ // uncomment when developing, comment for shipping version -error_reporting (E_ALL); +#error_reporting (E_ALL); #error_reporting (E_ERROR | E_WARNING | E_PARSE); -#error_reporting(0); +error_reporting(0); // Older versions of PHP do not define $_SERVER. Define it here instead. -- cgit v1.2.3