Changeset 1153:1e48950b05af for inc/prepend.php

Timestamp:

04/02/13 13:15:32 (12 years ago)

Author:

Dsls <dsls@…>

Branch:

twig

Parents:

1152:fbd922f6ed09 (diff), 1138:11db80678704 (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

File:

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

inc/prepend.php

@@ -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['dcTemplate']               = dirname(__FILE__).'/core/class.dc.template.php';
-$__autoload['dcContext']           = dirname(__FILE__).'/core/class.dc.context.php';
+$__autoload['dcTwigPage']               = dirname(__FILE__).'/core/class.dc.twig.page.php';
 
 $__autoload['rsExtPost']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
@@ -64 +62 @@
 $__autoload['adminUserList']            = dirname(__FILE__).'/admin/lib.pager.php';
 
-$__autoload['dcPublicContext']                    = dirname(__FILE__).'/public/class.dc.publiccontext.php';
-//$__autoload['dcTemplate']             = dirname(__FILE__).'/public/class.dc.template.php';
-//$__autoload['context']                = dirname(__FILE__).'/public/lib.tpl.context.php';
+$__autoload['dcTemplate']               = dirname(__FILE__).'/public/class.dc.template.php';
+$__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';
+$__autoload['dcItemList']               = 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
@@ -77 +79 @@
 
 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');
+     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']);
@@ -146 +148 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.5-RC');
+define('DC_VERSION','2.5-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');