diff options
| author | Chad Little <clittle@users.sourceforge.net> | 2004-09-02 18:57:42 +0000 |
|---|---|---|
| committer | Chad Little <clittle@users.sourceforge.net> | 2004-09-02 18:57:42 +0000 |
| commit | f1f99f34eb1d692456717deb28dc8a1e338cfc73 (patch) | |
| tree | c85dd25467c200d018507cf40163cb254e5f05dd /functions | |
| parent | 7a1af61f7f34c555d7c1be0b6a8eb9f06fd505ba (diff) | |
| download | phpicalendar-f1f99f34eb1d692456717deb28dc8a1e338cfc73.tar.gz phpicalendar-f1f99f34eb1d692456717deb28dc8a1e338cfc73.tar.bz2 phpicalendar-f1f99f34eb1d692456717deb28dc8a1e338cfc73.zip | |
Fixes.
Diffstat (limited to 'functions')
| -rw-r--r-- | functions/ical_parser.php | 2 | ||||
| -rw-r--r-- | functions/init.inc.php | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/functions/ical_parser.php b/functions/ical_parser.php index 917b43c..38b619b 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -253,7 +253,7 @@ foreach ($cal_filelist as $filename) { $allday_end = ($start_date + 1); } } - if (isset($start_unixtime,$end_unixtime) && date('d',$start_unixtime) != date('d',$end_unixtime)) { + if (isset($start_unixtime,$end_unixtime) && date('Ymd',$start_unixtime) != date('Ymd',$end_unixtime)) { $spans_day = true; $bleed_check = (($start_unixtime - $end_unixtime) < (60*60*24)) ? '-1' : '0'; } else { diff --git a/functions/init.inc.php b/functions/init.inc.php index 8097ce6..e22db72 100644 --- a/functions/init.inc.php +++ b/functions/init.inc.php @@ -70,10 +70,9 @@ if (ini_get('max_execution_time') < 60) { } if ($calendar_path == '') { - $calendar_path = 'calendars'; - $calendar_path_orig = $calendar_path; - $calendar_path = BASE.$calendar_path; + $calendar_path = 'calendars'; } +$calendar_path = BASE.$calendar_path; $is_webcal = FALSE; if (isset($_GET['cal']) && $_GET['cal'] != '') { |