Changeset 2496:e33dcbc18e36 for inc

Timestamp:

10/27/13 09:52:46 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

2495:dc8c7974ff0b (diff), 2494:b168f47c7f9c (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 2.6 commits to the current 2.7-dev

Files:

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

inc/prepend.php

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

inc/prepend.php

@@ -35 +35 @@
 $__autoload['dcPostMedia']                   = dirname(__FILE__).'/core/class.dc.postmedia.php';
 $__autoload['dcModules']                = dirname(__FILE__).'/core/class.dc.modules.php';
+$__autoload['dcPlugins']                = dirname(__FILE__).'/core/class.dc.plugins.php';
 $__autoload['dcThemes']                 = dirname(__FILE__).'/core/class.dc.themes.php';
 $__autoload['dcRestServer']             = dirname(__FILE__).'/core/class.dc.rest.php';
@@ -280 +281 @@
      # 60 : template processing error
      # 70 : blog is offline
-     
+
      if (CLI_MODE)
      {