phpicalendar-commits

[PHPiCalendar-Commits] phpicalendar/functions overlapping_events.php,1.14,1.15

[<dan...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1-new.sourceforge.net:/tmp/cvs-serv5550/functions

Modified Files:
	overlapping_events.php 
Log Message:
Fix the #1469443 bug. Events are now displayed in the right column.


Index: overlapping_events.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/overlapping_events.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** overlapping_events.php	16 Mar 2006 00:28:54 -0000	1.14
--- overlapping_events.php	4 May 2006 09:45:38 -0000	1.15
***************
*** 91,94 ****
--- 91,95 ----
  				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']);

[PHPiCalendar-Commits] phpicalendar/functions overlapping_events.php,1.14,1.15

[<dan...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1-new.sourceforge.net:/tmp/cvs-serv436/functions

Modified Files:
	overlapping_events.php 
Log Message:
Fix the #1469443 bug. Events are now displayed in the right column.\nLast commit didn't work ???

Index: overlapping_events.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/overlapping_events.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** overlapping_events.php	16 Mar 2006 00:28:54 -0000	1.14
--- overlapping_events.php	9 May 2006 09:33:25 -0000	1.15
***************
*** 91,94 ****
--- 91,95 ----
  				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']);