From: <par...@us...> - 2010-04-16 19:02:44
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8207/functions Modified Files: ical_parser.php init.inc.php Log Message: Fix calendar selection bug assuming "All Calendars Combined" Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.260 retrieving revision 1.261 diff -C2 -d -r1.260 -r1.261 *** ical_parser.php 15 Apr 2010 19:39:54 -0000 1.260 --- ical_parser.php 16 Apr 2010 19:02:36 -0000 1.261 *************** *** 12,16 **** $parse_file = true; if ($phpiCal_config->save_parsed_cals == 'yes') { ! if (sizeof ($cal_filelist) > 1) { // This is a special case for "all calendars combined" $parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$phpiCal_config->ALL_CALENDARS_COMBINED).'-'.$this_year; --- 12,16 ---- $parse_file = true; if ($phpiCal_config->save_parsed_cals == 'yes') { ! if (count($cal_filelist) == count($all_calendars_combined)) { // This is a special case for "all calendars combined" $parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$phpiCal_config->ALL_CALENDARS_COMBINED).'-'.$this_year; Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** init.inc.php 18 Jun 2009 16:21:46 -0000 1.123 --- init.inc.php 16 Apr 2010 19:02:36 -0000 1.124 *************** *** 49,55 **** } //load cal_filenames if $ALL_CALENDARS_COMBINED if ($cal_filenames[0] == $phpiCal_config->ALL_CALENDARS_COMBINED){ ! $cal_filenames = availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED); } // Separate the calendar identifiers into web calendars and local --- 49,57 ---- } + $all_calendars_combined = availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED); + //load cal_filenames if $ALL_CALENDARS_COMBINED if ($cal_filenames[0] == $phpiCal_config->ALL_CALENDARS_COMBINED){ ! $cal_filenames = $all_calendars_combined; } // Separate the calendar identifiers into web calendars and local |