From 240478eaa4215572691e01fc79ce2dedf9767337 Mon Sep 17 00:00:00 2001 From: Jason Oster Date: Wed, 27 May 2009 16:47:40 +0000 Subject: Fixes for print view --- functions/init/date_range.php | 1 + functions/template.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/functions/init/date_range.php b/functions/init/date_range.php index 6306c04..e202b6d 100644 --- a/functions/init/date_range.php +++ b/functions/init/date_range.php @@ -30,6 +30,7 @@ switch ($current_view){ case 'month': case 'week': case 'day': + case 'print': $mArray_begin = mktime (0,0,0,$start_month,1,($start_year)); $mArray_end = mktime (0,0,0,$end_month,31,($end_year)); break; diff --git a/functions/template.php b/functions/template.php index 3b3bf78..0a0c212 100644 --- a/functions/template.php +++ b/functions/template.php @@ -77,7 +77,7 @@ class Page { $day_events = 0; // Pull out each day $some_events = ''; - foreach ($val as $new_val) { + foreach ($val as $cal_time => $new_val) { foreach ($new_val as $new_key2 => $new_val2) { if (isset($seen_events["$new_key2"]) && isset($new_val2['spans_day']) && $new_val2['spans_day'] == 1){ $new_val2['event_text'] .= " second instance of ".$new_key2; @@ -97,7 +97,7 @@ class Page { $event_start = $new_val2['event_start']; $event_end = $new_val2['event_end']; if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end']; - if (!isset($new_val2['event_start'])) { + if ($cal_time == -1) { $event_start = $lang['l_all_day']; $event_start2 = ''; $event_end = ''; -- cgit v1.2.3