[PHPiCalendar-Commits] phpicalendar/functions init.inc.php,1.81,1.82

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3997/phpicalendar/functions

Modified Files:
	init.inc.php 
Log Message:
fix order of default path, cpath, and calling error.tpl in init.inc.php

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** init.inc.php	2 Dec 2005 17:24:01 -0000	1.81
--- init.inc.php	4 Dec 2005 17:52:52 -0000	1.82
***************
*** 15,19 ****
  if (!defined('BASE')) define('BASE', './');
  include_once(BASE.'config.inc.php');
- include_once(BASE.'error.php');
  
  if (isset($_COOKIE['phpicalendar'])) {
--- 15,18 ----
***************
*** 42,45 ****
--- 41,48 ----
  }
  #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');
***************
*** 88,92 ****
  }
  
- 
  // 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.
--- 91,94 ----