[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php,1.169,1.170 list_functions.php,1.7,1.8

[<cl...@us...>]

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

Modified Files:
	ical_parser.php list_functions.php 
Log Message:
FIxed a bug not allowing all combined to cache.



Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** ical_parser.php	25 May 2004 23:29:49 -0000	1.169
--- ical_parser.php	28 May 2004 16:33:48 -0000	1.170
***************
*** 156,162 ****
  			case 'END:VEVENT':
  				
! 				if (!isset($master_array[-3][$calnumber])) $master_array[-3][$calnumber] = $actual_calname;
! 				if (!isset($master_array[-4][$calnumber]['mtime'])) $master_array[-4][$calnumber]['mtime'] = $actual_mtime;
! 				if (!isset($master_array[-4][$calnumber]['filename'])) $master_array[-4][$calnumber]['filename'] = $filename;
  				if (!isset($url)) $url = '';
  				if (!isset($type)) $type = '';
--- 156,162 ----
  			case 'END:VEVENT':
  				
! 				if (!isset($master_array['-3'][$calnumber])) $master_array['-3'][$calnumber] = $actual_calname;
! 				if (!isset($master_array['-4'][$calnumber]['mtime'])) $master_array['-4'][$calnumber]['mtime'] = $actual_mtime;
! 				if (!isset($master_array['-4'][$calnumber]['filename'])) $master_array['-4'][$calnumber]['filename'] = $filename;
  				if (!isset($url)) $url = '';
  				if (!isset($type)) $type = '';

Index: list_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** list_functions.php	24 May 2004 05:26:41 -0000	1.7
--- list_functions.php	28 May 2004 16:33:48 -0000	1.8
***************
*** 13,17 ****
  function list_calcolors() {
  	global $template, $master_array;
! 	foreach ($master_array[-3] as $key => $val) {
  		$return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br />';
  	}
--- 13,17 ----
  function list_calcolors() {
  	global $template, $master_array;
! 	foreach ($master_array['-3'] as $key => $val) {
  		$return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br />';
  	}