[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.1,1.66.2.2

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.uicalendar.inc.php 
Log Message:
Improper display of day view data, was doing an || instead of &&.

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.1
retrieving revision 1.66.2.2
diff -C2 -r1.66.2.1 -r1.66.2.2
*** class.uicalendar.inc.php    17 Feb 2002 03:56:48 -0000      1.66.2.1
--- class.uicalendar.inc.php    18 Feb 2002 00:28:45 -0000      1.66.2.2
***************
*** 2884,2888 ****
                                                        echo 'IND before = 
'.$ind."<br>\n";
                                                }
!                                               if(($ind >= 
date('H',$starttime)) || ($ind <= date('H',$endtime)))
                                                {
                                                        $ind = $last_ind;
--- 2884,2888 ----
                                                        echo 'IND before = 
'.$ind."<br>\n";
                                                }
!                                               if(($ind >= 
date('H',$last_starttime)) && ($ind <= date('H',$last_endtime)))
                                                {
                                                        $ind = $last_ind;