[PHPiCalendar-Commits] phpicalendar/functions draw_functions.php, 1.10, 1.11

[<par...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21961/functions

Modified Files:
	draw_functions.php 
Log Message:
Fix overlapping events, Bug #2968512

Index: draw_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/draw_functions.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** draw_functions.php	8 Jul 2009 18:28:13 -0000	1.10
--- draw_functions.php	15 Apr 2010 20:36:14 -0000	1.11
***************
*** 32,36 ****
  		}
  	}
! 	$draw_len = ($end_h * 60 + $end_min) - ($sta_h * 60 + $sta_min);
  
  	return array ("draw_start" => ($sta_h . $sta_min), "draw_end" => ($end_h . $end_min), "draw_length" => $draw_len);
--- 32,41 ----
  		}
  	}
! 	$sta = ($sta_h * 60 + $sta_min);
! 	$end = ($end_h * 60 + $end_min);
! 	if ($sta < $end)
! 		$draw_len = $end - $sta;
! 	else
! 		$draw_len = $sta - $end;
  
  	return array ("draw_start" => ($sta_h . $sta_min), "draw_end" => ($end_h . $end_min), "draw_length" => $draw_len);