From 6e65385370e1b1ea92f522119ebd1725c3a5d29c Mon Sep 17 00:00:00 2001 From: Jim Hu Date: Sun, 4 Dec 2005 17:52:52 +0000 Subject: fix order of default path, cpath, and calling error.tpl in init.inc.php --- functions/init.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'functions/init.inc.php') diff --git a/functions/init.inc.php b/functions/init.inc.php index 23539bb..d9c3619 100644 --- a/functions/init.inc.php +++ b/functions/init.inc.php @@ -14,7 +14,6 @@ $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'; // Pull in the configuration and some functions. if (!defined('BASE')) define('BASE', './'); include_once(BASE.'config.inc.php'); -include_once(BASE.'error.php'); if (isset($_COOKIE['phpicalendar'])) { $phpicalendar = unserialize(stripslashes($_COOKIE['phpicalendar'])); @@ -41,6 +40,10 @@ if($_REQUEST['cpath']){ $tmp_dir .= "/$cpath"; } #these need cpath to be set +if (isset($user_template[$cpath])){ +Ê Ê Ê$template = $user_template[$cpath]; +} +include_once(BASE.'error.php'); include_once(BASE.'functions/calendar_functions.php'); include_once(BASE.'functions/userauth_functions.php'); @@ -87,7 +90,6 @@ if (ini_get('max_execution_time') < 60) { @ini_set('max_execution_time', '60'); } - // Pull the calendars off the GET line if provided. The $cal_filename // is always an array, because this makes it easier to deal with below. $cal_filenames = array(); -- cgit v1.2.3