diff options
| -rw-r--r-- | functions/ical_parser.php | 2 | ||||
| -rw-r--r-- | functions/template.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/functions/ical_parser.php b/functions/ical_parser.php index b6b2a70..3db6e3f 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -11,7 +11,7 @@ include_once(BASE.'functions/parse/recur_functions.php'); $parse_file = true; if ($phpiCal_config->save_parsed_cals == 'yes') { if (sizeof ($cal_filelist) > 1) { - $parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year; + $parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$phpiCal_config->ALL_CALENDARS_COMBINED).'-'.$this_year; if (file_exists($parsedcal)) { $fd = fopen($parsedcal, 'r'); $contents = fread($fd, filesize($parsedcal)); diff --git a/functions/template.php b/functions/template.php index 4d7ad72..cc80925 100644 --- a/functions/template.php +++ b/functions/template.php @@ -5,8 +5,8 @@ class Page { var $page; function draw_subscribe($template_p) { - global $phpiCal_config, $getdate, $cal, $ALL_CALENDARS_COMBINED, $subscribe_path, $download_filename; - if ($cal != $ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') { + global $phpiCal_config, $getdate, $cal, $subscribe_path, $download_filename; + if ($cal != $phpiCal_config->ALL_CALENDARS_COMBINED && $subscribe_path != '' && $download_filename != '') { $this->page = str_replace('{SUBSCRIBE_PATH}', $subscribe_path, $this->page); $this->page = str_replace('{DOWNLOAD_FILENAME}', $download_filename, $this->page); } else { |