Changeset 2468:d7fda5a0bd39 for inc/prepend.php

Timestamp:

10/21/13 09:08:36 (12 years ago)

Author:

Dsls

Branch:

twig

Children:

2593:6741802596a0, 2609:c26642f775e2

Parents:

2321:3ab5e6c3d301 (diff), 2466:e42d3233f080 (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 2.6

Files:

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

inc/prepend.php

@@ -193 +193 @@
 if (!defined('DC_UPDATE_VERSION')) {
      define('DC_UPDATE_VERSION','stable');
+}
+
+if (!defined('DC_ALLOW_MULTI_MODULES')) {
+     define('DC_ALLOW_MULTI_MODULES',false);
 }
 

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['dcStore']             = dirname(__FILE__).'/core/class.dc.store.php';
 $__autoload['dcStoreReader']       = dirname(__FILE__).'/core/class.dc.store.reader.php';
@@ -56 +57 @@
 $__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';
@@ -74 +76 @@
 $__autoload['dcCommentsActionsPage']              = dirname(__FILE__).'/admin/actions/class.dcactioncomments.php';
 $__autoload['dcActionsPage']            = dirname(__FILE__).'/admin/actions/class.dcaction.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';
+$__autoload['dcItemList']               = dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['dcListFetcher']            = dirname(__FILE__).'/admin/class.dc.list.php';
+
+foreach (array('dcFilterSet', 'dcFilter','dcFilterCombo','dcFilterText','dcFilterBoolean') as $c) {
+     $__autoload[$c] = dirname(__FILE__).'/admin/class.dc.filter.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();
+
 /* ------------------------------------------------------------------------------------------- */
 
@@ -134 +160 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.6-RC');
+define('DC_VERSION','2.99-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');
@@ -280 +306 @@
      # 60 : template processing error
      # 70 : blog is offline
-
+     
      if (CLI_MODE)
      {