aboutsummaryrefslogtreecommitdiffstats
path: root/functions
diff options
context:
space:
mode:
authorJason Oster <parasytic@users.sourceforge.net>2009-06-17 17:35:10 +0000
committerJason Oster <parasytic@users.sourceforge.net>2009-06-17 17:35:10 +0000
commitb5a0b87e7ed2f5882b23ec5cafd7b8fb56eaac0e (patch)
tree437cfa70425c177eeb9ab9b73329f8a039238e4b /functions
parent0af7a80d9b273051bad96024369d72a74b20eadb (diff)
downloadphpicalendar-b5a0b87e7ed2f5882b23ec5cafd7b8fb56eaac0e.tar.gz
phpicalendar-b5a0b87e7ed2f5882b23ec5cafd7b8fb56eaac0e.tar.bz2
phpicalendar-b5a0b87e7ed2f5882b23ec5cafd7b8fb56eaac0e.zip
Fixed bugs with ALL_CALENDARS_COMBINED and saving parsed calendars
Diffstat (limited to 'functions')
-rw-r--r--functions/ical_parser.php2
-rw-r--r--functions/template.php4
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 {

© 2014-2022 Faster IT GmbH | imprint | privacy policy