extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't use start or end for range labels if they're missing / 0

Browse Source
This commit is contained in:
Nathan Gray 2011-07-04 21:22:57 +00:00
parent 3ac3cfeb24
commit d69661ab55
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/inc/class.calendar_merge.inc.php
View File

@ -121,8 +121,8 @@ class calendar_merge extends bo_merge
$id = array('start' => PHP_INT_MAX, 'end' => 0);
$this->ids = array();
foreach($events as $event) {
if($event['start'] < $id['start']) $id['start'] = $event['start'];
if($event['end'] > $id['end']) $id['end'] = $event['end'];
if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
// Keep ids for future use
$this->ids[] = $event['id'];
}
@ -225,8 +225,8 @@ class calendar_merge extends bo_merge
if($date[0]['start']) {
$id = array('start' => PHP_INT_MAX, 'end' => 0);
foreach($date as $event) {
if($event['start'] < $id['start']) $id['start'] = $event['start'];
if($event['end'] > $id['end']) $id['end'] = $event['end'];
if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
}
$date = $id;
} else {
@ -309,8 +309,8 @@ class calendar_merge extends bo_merge
{
$dates = array('start' => PHP_INT_MAX, 'end' => 0);
foreach($id as $event) {
if($event['start'] < $dates['start']) $dates['start'] = $event['start'];
if($event['end'] > $dates['end']) $dates['end'] = $event['end'];
if($event['start'] && $event['start'] < $dates['start']) $dates['start'] = $event['start'];
if($event['end'] && $event['end'] > $dates['end']) $dates['end'] = $event['end'];
}
$id = $dates;
}