From 9bcff824532f4c8000ad6bf7254ac3979997e43c Mon Sep 17 00:00:00 2001 From: skeeter Date: Sun, 1 Jul 2001 16:08:13 +0000 Subject: [PATCH] Possible fix for knecke running idsociety on php4. --- calendar/inc/header.inc.php | 14 +++++++++----- calendar/templates/idsociety/header.inc.php | 2 ++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/calendar/inc/header.inc.php b/calendar/inc/header.inc.php index 1828a3c5c6..4fdbc00dae 100644 --- a/calendar/inc/header.inc.php +++ b/calendar/inc/header.inc.php @@ -14,10 +14,11 @@ /* $Id$ */ - if (floor(phpversion()) == 4) { - global $date, $year, $month, $day, $thisyear, $thismonth, $thisday, $filter, $keywords; - global $matrixtype, $participants, $owner, $phpgw, $grants, $rights, $SCRIPT_FILENAME, $remainder; - } + if (floor(phpversion()) == 4) + { + global $date, $year, $month, $day, $thisyear, $thismonth, $thisday, $filter, $keywords; + global $matrixtype, $participants, $owner, $phpgw, $grants, $rights, $SCRIPT_FILENAME, $remainder, $tpl; + } $cols = 8; if($phpgw->calendar->check_perms(PHPGW_ACL_PRIVATE) == True) @@ -25,6 +26,9 @@ $cols++; } - include(PHPGW_APP_TPL.'/header.inc.php'); + $tpl = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('calendar')); + $tpl->set_unknowns('remove'); + + include($phpgw->common->get_tpl_dir('calendar').'/header.inc.php'); flush(); ?> diff --git a/calendar/templates/idsociety/header.inc.php b/calendar/templates/idsociety/header.inc.php index 550a544ed3..b24d37319b 100755 --- a/calendar/templates/idsociety/header.inc.php +++ b/calendar/templates/idsociety/header.inc.php @@ -23,6 +23,8 @@ return ''.$alt.''; } + $tpl = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('calendar')); + $tpl->set_unknowns('remove'); $templates = Array( 'head_tpl' => 'head.tpl', 'form_button_dropdown' => 'form_button_dropdown.tpl',