diff options
| author | Danon <danone_lyon@users.sourceforge.net> | 2006-05-09 09:33:25 +0000 |
|---|---|---|
| committer | Danon <danone_lyon@users.sourceforge.net> | 2006-05-09 09:33:25 +0000 |
| commit | 8a47ad7ef5e843596ba8b754f97ab21d60ff982b (patch) | |
| tree | 9d5b775b220d6f09c88ddbcafe187f7caab8b003 | |
| parent | 8a971040036f4948b278a3837cd5e3b3d3140d14 (diff) | |
| download | phpicalendar-8a47ad7ef5e843596ba8b754f97ab21d60ff982b.tar.gz phpicalendar-8a47ad7ef5e843596ba8b754f97ab21d60ff982b.tar.bz2 phpicalendar-8a47ad7ef5e843596ba8b754f97ab21d60ff982b.zip | |
Fix the #1469443 bug. Events are now displayed in the right column.\nLast commit didn't work ???
| -rw-r--r-- | functions/overlapping_events.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/functions/overlapping_events.php b/functions/overlapping_events.php index 84e2afa..9595c83 100644 --- a/functions/overlapping_events.php +++ b/functions/overlapping_events.php @@ -90,6 +90,7 @@ function flatten_ol_blocks($event_date, $ol_blocks, $new_block_key) { if ($new_block['blockStart'] > $loop_block['blockStart']) $ol_blocks[$new_block_key]['blockStart'] = $loop_block['blockStart']; if ($new_block['blockEnd'] < $loop_block['blockEnd']) $ol_blocks[$new_block_key]['blockEnd'] = $loop_block['blockEnd']; $ol_blocks[$new_block_key]['events'] = array_merge($new_block['events'], $loop_block['events']); + $new_block['events'] = $ol_blocks[$new_block_key]['events']; foreach ($loop_block['overlapRanges'] as $ol_range) { $new_block['overlapRanges'] = merge_range($new_block['overlapRanges'], $ol_range['start'], $ol_range['end'], $ol_range['count']); } |