Changeset 1106:a4487f3ca4b4 for inc

Timestamp:

02/25/13 10:18:08 (12 years ago)

Author:

JcDenis

Branch:

twig

Parents:

1101:7273894e61b8 (diff), 1105:ce855d61f9ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with default branch in 2.5-RC

Files:

• inc/prepend.php (modified) (1 diff)
• inc/prepend.php (modified) (4 diffs)

inc/prepend.php

@@ -143 +143 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.5-dev');
+define('DC_VERSION','2.5-RC');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');

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');
@@ -46 +46 @@
 $__autoload['dcWorkspace']              = dirname(__FILE__).'/core/class.dc.workspace.php';
 $__autoload['dcPrefs']                  = dirname(__FILE__).'/core/class.dc.prefs.php';
+$__autoload['dcTwigPage']               = dirname(__FILE__).'/core/class.dc.twig.page.php';
 
 $__autoload['rsExtPost']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
@@ -52 +53 @@
 $__autoload['rsExtUser']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
 
+$__autoload['dcAdminContext']                = dirname(__FILE__).'/admin/class.dc.admincontext.php';
 $__autoload['dcMenu']                   = dirname(__FILE__).'/admin/class.dc.menu.php';
 $__autoload['dcPage']                   = dirname(__FILE__).'/admin/lib.dc.page.php';
@@ -63 +65 @@
 $__autoload['context']                  = dirname(__FILE__).'/public/lib.tpl.context.php';
 $__autoload['dcUrlHandlers']            = dirname(__FILE__).'/public/lib.urlhandlers.php';
+$__autoload['dcForm']              = dirname(__FILE__).'/admin/class.dc.form.php';
+$__autoload['dcFormExtension']               = dirname(__FILE__).'/admin/class.dc.form.php';
+$__autoload['dcTabExtension']           = dirname(__FILE__).'/admin/class.dc.tab.php';
 
 # Clearbricks extensions
 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();
+
 /* ------------------------------------------------------------------------------------------- */