diff options
| author | Chad Little <clittle@users.sourceforge.net> | 2004-05-16 06:44:04 +0000 |
|---|---|---|
| committer | Chad Little <clittle@users.sourceforge.net> | 2004-05-16 06:44:04 +0000 |
| commit | 2689498f9dfc027d360b7fdb023fe6c5a4038ec1 (patch) | |
| tree | 191292653f29a346a3ef38cea947634de4213a7d | |
| parent | 34b8a450d77e374fe3f268eed30ba37e131fde62 (diff) | |
| download | phpicalendar-2689498f9dfc027d360b7fdb023fe6c5a4038ec1.tar.gz phpicalendar-2689498f9dfc027d360b7fdb023fe6c5a4038ec1.tar.bz2 phpicalendar-2689498f9dfc027d360b7fdb023fe6c5a4038ec1.zip | |
Fixed month_event_lines, month_bottom popups, and all-day language on event.php.
| -rw-r--r-- | functions/template.php | 5 | ||||
| -rw-r--r-- | includes/event.php | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/functions/template.php b/functions/template.php index 7f79b3a..6e1bf6b 100644 --- a/functions/template.php +++ b/functions/template.php @@ -697,7 +697,6 @@ class Page { $minical_year = date("Y", $fake_getdate_time); $first_of_month = $minical_year.$minical_month."01"; $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day)); - $month_event_lines = 0; $i = 0; $whole_month = TRUE; @@ -799,14 +798,14 @@ class Page { if (!isset($val['event_start'])) { $switch['START_TIME'] = $lang['l_all_day']; $switch['DESCRIPTION'] = urldecode($val['description']); - $switch['EVENT_TEXT'] = openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url); + $switch['EVENT_TEXT'] = openevent($switch['CALNAME'], '', '', $val, $month_event_lines, 15, '', '', 'psf', $switch['URL']); } else { $event_start = $val['start_unixtime']; $event_end = (isset($val['display_end'])) ? $val['display_end'] : $val["event_end"]; $event_start = date($timeFormat, $val['start_unixtime']); $event_end = date($timeFormat, @strtotime ($event_end)); $switch['START_TIME'] = $event_start . ' - ' . $event_end; - $switch['EVENT_TEXT'] = openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url); + $switch['EVENT_TEXT'] = openevent($switch['CALNAME'], '', '', $val, 0, 15, '', '', 'psf', $switch['URL']); $switch['DESCRIPTION'] = urldecode($val['description']); } if ($switch['EVENT_TEXT'] != '') { diff --git a/includes/event.php b/includes/event.php index 803403f..fb22ba2 100644 --- a/includes/event.php +++ b/includes/event.php @@ -28,7 +28,7 @@ if (($start) && ($end)) { $event_times = $start . ' - ' . $end; } if ($start == '' && $end == '' && (isset($start) && isset($end))) { - $event_times = $all_day_lang; + $event_times = $lang['l_all_day']; } if ($description) $description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$description); |