Changeset 1010:bc56e534b081

Timestamp:

11/14/12 19:23:54 (13 years ago)

Author:

JcDenis

Branch:

twig

Message:

Better way to search Twig path

File:

• inc/prepend.php (modified) (3 diffs)

inc/prepend.php

@@ -12 +12 @@
 
 /* ------------------------------------------------------------------------------------------- */
-#  ClearBricks, DotClear classes auto-loader
+#  ClearBricks, Twig, DotClear classes auto-loader
 if (@is_dir('/usr/lib/clearbricks')) {
      define('CLEARBRICKS_PATH','/usr/lib/clearbricks');
@@ -62 +62 @@
 $__autoload['adminCommentList']         = dirname(__FILE__).'/admin/lib.pager.php';
 $__autoload['adminUserList']            = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['Twig_Autoloader']          = dirname(__FILE__).'/libs/twig/Autoloader.php';
-Twig_Autoloader::register();
 
 $__autoload['dcTemplate']               = dirname(__FILE__).'/public/class.dc.template.php';
@@ -74 +72 @@
 html::$absolute_regs[] = '/(<param\s+name="movie"\s+value=")(.*?)(")/msu';
 html::$absolute_regs[] = '/(<param\s+name="FlashVars"\s+value=".*?(?:mp3|flv)=)(.*?)(&|")/msu';
+
+if (@is_dir('/usr/lib/twig')) {
+     define('TWIG_PATH','/usr/lib/twig');
+} elseif (is_dir(dirname(__FILE__).'/libs/twig')) {
+     define('TWIG_PATH',dirname(__FILE__).'/libs/twig');
+} elseif (isset($_SERVER['TWIG_PATH']) && is_dir($_SERVER['TWIG_PATH'])) {
+     define('TWIG_PATH',$_SERVER['TWIG_PATH']);
+}
+
+if (!defined('TWIG_PATH') || !is_dir(TWIG_PATH)) {
+     exit('No Twig path defined');
+}
+require TWIG_PATH.'/Autoloader.php';
+Twig_Autoloader::register();
 /* ------------------------------------------------------------------------------------------- */