From 8eba7c519433c6cc6652afb9ff70ac52d20a471c Mon Sep 17 00:00:00 2001 From: skeeter Date: Sun, 13 May 2001 03:55:09 +0000 Subject: [PATCH] Small fixes to the holidays. --- calendar/inc/class.calendar_holiday.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_holiday.inc.php b/calendar/inc/class.calendar_holiday.inc.php index 413eca35ee..1fd2e8799b 100755 --- a/calendar/inc/class.calendar_holiday.inc.php +++ b/calendar/inc/class.calendar_holiday.inc.php @@ -117,7 +117,7 @@ class calendar_holiday { global $phpgw; - if($holiday['mday'] == 0 && $holiday['dow'] != 0 && $holiday['occurence'] != 0) + if($holiday['day'] == 0 && $holiday['dow'] != 0 && $holiday['occurence'] != 0) { if($holiday['occurence'] != 99) { @@ -186,9 +186,9 @@ class calendar_holiday $this->holidays[$i]['month'] = intval($this->db->f('month_num')); $this->holidays[$i]['occurence'] = intval($this->db->f('occurence')); $this->holidays[$i]['dow'] = intval($this->db->f('dow')); - if(count($find_locale) == 2 && $find_locale[0] != $find_locale[1]) + if(count($this->users) == 2 && $this->users[0] != $this->users[1]) { - if($this->holidays[$i]['locale'] == $find_locale[1]) + if($this->holidays[$i]['locale'] == $this->users[1]) { $this->holidays[$i]['owner'] = 'user'; } @@ -255,7 +255,7 @@ class calendar_holiday function find_date($date) { global $phpgw; - + $c_holidays = count($this->holidays); for($i=0;$i<$c_holidays;$i++) {