[Phpgroupware-cvs] CVS: calendar/inc class.holidaycalc_JP.inc.php,1.1.2.2,1.1.2.3

[Yoshihiro Kamimura <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv13518

Modified Files:
      Tag: Version-0_9_14-branch
        class.holidaycalc_JP.inc.php 
Log Message:
The correspondence of Bug #1067.

Index: class.holidaycalc_JP.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.holidaycalc_JP.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** class.holidaycalc_JP.inc.php        23 Jun 2002 20:28:43 -0000      1.1.2.2
--- class.holidaycalc_JP.inc.php        24 Aug 2002 10:08:11 -0000      1.1.2.3
***************
*** 86,98 ****
                        if($dow == 0)
                        {
!                               $i++;
!                               $holidays[$i]['locale'] = $holiday['locale'].' 
(Observed)';
!                               $holidays[$i]['name'] = lang('overlap holiday');
!                               $holidays[$i]['day'] = $holiday['day'] + 1;
!                               $holidays[$i]['month'] = $holiday['month'];
!                               $holidays[$i]['occurence'] = 
$holiday['occurence'];
!                               $holidays[$i]['dow'] = $holiday['dow'];
!                               $holidays[$i]['date'] = 
mktime(0,0,0,$holiday['month'],$day+1,$year);
!                               $holidays[$i]['obervance_rule'] = 0;
                        }
                }
--- 86,98 ----
                        if($dow == 0)
                        {
!                               $addcnt = count($holidays) + 1;
!                               $holidays[$addcnt]['locale'] = 
$holiday['locale'];
!                               $holidays[$addcnt]['name'] = lang('overlap 
holiday');
!                               $holidays[$addcnt]['day'] = $holiday['day'] + 1;
!                               $holidays[$addcnt]['month'] = $holiday['month'];
!                               $holidays[$addcnt]['occurence'] = 
$holiday['occurence'];
!                               $holidays[$addcnt]['dow'] = $holiday['dow'];
!                               $holidays[$addcnt]['date'] = 
mktime(0,0,0,$holiday['month'],$day+1,$year);
!                               $holidays[$addcnt]['obervance_rule'] = 0;
                        }
                }