From: <nk...@us...> - 2011-03-03 05:44:00
|
Revision: 33215 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33215&view=rev Author: nkoth Date: 2011-03-03 05:43:54 +0000 (Thu, 03 Mar 2011) Log Message: ----------- [bp/r33214][FIX] Multi day events not showing on correct cells Modified Paths: -------------- branches/proposals/6.x/lib/trackers/trackerlib.php Modified: branches/proposals/6.x/lib/trackers/trackerlib.php =================================================================== --- branches/proposals/6.x/lib/trackers/trackerlib.php 2011-03-03 05:40:54 UTC (rev 33214) +++ branches/proposals/6.x/lib/trackers/trackerlib.php 2011-03-03 05:43:54 UTC (rev 33215) @@ -4393,9 +4393,9 @@ } $overs = array(); foreach ($items as $item) { - $endDay = TikiLib::make_time(0,0,0, $day['month'], $day['day']+1, $day['year']); - if ((count($fieldIds) == 1 && $item['field_values'][$iStart]['value'] >= $day['date'] && $item['field_values'][$iStart]['value'] < $endDay) - || (count($fieldIds) > 1 && $item['field_values'][$iStart]['value'] <= $endDay && $item['field_values'][$iEnd]['value'] > $day['date'])) { + $endDay = TikiLib::make_time(23,59,59, $day['month'], $day['day'], $day['year']); + if ((count($fieldIds) == 1 && $item['field_values'][$iStart]['value'] >= $day['date'] && $item['field_values'][$iStart]['value'] <= $endDay) + || (count($fieldIds) > 1 && $item['field_values'][$iStart]['value'] <= $endDay && $item['field_values'][$iEnd]['value'] >= $day['date'])) { $cell[$i][$j]['items'][] = $item; $overs[] = preg_replace('|(<br /> *)*$|m', '', $item['over']); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |