fix order of default path, cpath, and calling error.tpl in init.inc.php

2 files changed, 5 insertions, 3 deletions

diff --git a/config.inc.php b/config.inc.php
index bdae127..f0e8d1a 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -33,7 +33,7 @@ $charset				= 'UTF-8';			// Character set your calendar is in, suggested UTF-8,
 $allow_webcals 			= 'no';				// Allow http:// and webcal:// prefixed URLs to be used as the $cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below.
 $this_months_events 	= 'yes';			// Display "This month's events" at the bottom off the month page.
 $enable_rss				= 'yes';			// Enable RSS access to your calendars (good thing).
-$show_search			= 'no';			// Show the search box in the sidebar.
+$show_search			= 'yes';			// Show the search box in the sidebar.
 $allow_preferences		= 'yes';			// Allow visitors to change various preferences via cookies.
 $printview_default		= 'no';				// Set print view as the default view. day, week, and month only supported views for $default_view (listed well above).
 $show_todos				= 'yes';			// Show your todo list on the side of day and week view.
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();