extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 20:31:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed warning if tagWholeDayOnTop($dayEvents) is called with no array, eg. false because no events found

Browse Source
This commit is contained in:
Ralf Becker 2010-01-20 23:21:00 +00:00
parent 8c1e245925
commit 74383ecb15
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2207,10 +2207,13 @@ class calendar_uiviews extends calendar_ui
function tagWholeDayOnTop($dayEvents) function tagWholeDayOnTop($dayEvents)
{ {
$this->extraRows = $this->extraRowsOriginal; $this->extraRows = $this->extraRowsOriginal;
if (is_array($dayEvents))
{
foreach ($dayEvents as $day=>$oneDayEvents) foreach ($dayEvents as $day=>$oneDayEvents)
{ {
$extraRowsToAdd = 0; $extraRowsToAdd = 0;
foreach ($oneDayEvents as $num=>$event) foreach ($oneDayEvents as $num => $event)
{ {
$start = $this->bo->date2array($event['start']); $start = $this->bo->date2array($event['start']);
$end = $this->bo->date2array($event['end']); $end = $this->bo->date2array($event['end']);
@ -2229,9 +2232,12 @@ class calendar_uiviews extends calendar_ui
} }
} }
// check after every day if we have to increase $this->extraRows // check after every day if we have to increase $this->extraRows
if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows) { $this->extraRows = ($this->extraRowsOriginal+$extraRowsToAdd); } if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows)
{
$this->extraRows = ($this->extraRowsOriginal+$extraRowsToAdd);
}
}
} }
return $dayEvents; return $dayEvents;
} }
} }