Changeset 782:01efbf050a8a for inc/prepend.php

Timestamp:

12/06/11 11:43:14 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Parents:

781:b509ac00bf4a (diff), 779:58c45f1b96e5 (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:

Merged last default changes with formfilter branch

Files:

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

inc/prepend.php

@@ -55 +55 @@
 $__autoload['dcPage']                   = dirname(__FILE__).'/admin/lib.dc.page.php';
 $__autoload['adminGenericList']         = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminPostList']            = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminPostMiniList']        = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminCommentList']         = dirname(__FILE__).'/admin/lib.pager.php';
-$__autoload['adminUserList']            = dirname(__FILE__).'/admin/lib.pager.php';
+$__autoload['adminItemsList']           = dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminPostList']            = dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminPostMiniList']        = dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminCommentList']         = dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminUserList']            = dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminBlogList']            = dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['adminBlogPermissionsList'] = dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['dcFilterSet']              = dirname(__FILE__).'/admin/class.dc.filter.php';
+$__autoload['dcFilter']                 = dirname(__FILE__).'/admin/class.dc.filter.php';
+$__autoload['textFilter']                    = dirname(__FILE__).'/admin/class.dc.filter.php';
+$__autoload['comboFilter']                   = dirname(__FILE__).'/admin/class.dc.filter.php';
+$__autoload['dcFilterExtraInterface']                  = dirname(__FILE__).'/admin/class.dc.filter.php';
 
 $__autoload['dcTemplate']               = dirname(__FILE__).'/public/class.dc.template.php';

inc/prepend.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2010 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -10 +10 @@
 #
 # -- END LICENSE BLOCK -----------------------------------------
-
-//*== DC_DEBUG ==
-ini_set('display_errors',true);
-error_reporting(E_ALL | E_STRICT);
-define('DC_DEBUG',true);
-//*/
-
-if (!defined('DC_DEBUG')) {
-     define('DC_DEBUG',false);
-}
 
 /* ------------------------------------------------------------------------------------------- */
@@ -41 +31 @@
 $__autoload['dcCategories']             = dirname(__FILE__).'/core/class.dc.categories.php';
 $__autoload['dcError']                  = dirname(__FILE__).'/core/class.dc.error.php';
-$__autoload['dcGenericMeta']       = dirname(__FILE__).'/core/class.dc.genmeta.php';
 $__autoload['dcMeta']                   = dirname(__FILE__).'/core/class.dc.meta.php';
-$__autoload['dcUserMeta']                    = dirname(__FILE__).'/core/class.dc.usermeta.php';
 $__autoload['dcMedia']                  = dirname(__FILE__).'/core/class.dc.media.php';
+$__autoload['dcPostMedia']                   = dirname(__FILE__).'/core/class.dc.postmedia.php';
 $__autoload['dcModules']                = dirname(__FILE__).'/core/class.dc.modules.php';
 $__autoload['dcThemes']                 = dirname(__FILE__).'/core/class.dc.themes.php';
@@ -126 +115 @@
 require DC_RC_PATH;
 
+//*== DC_DEBUG ==
+if (!defined('DC_DEBUG')) {
+     define('DC_DEBUG',true);
+}
+if (DC_DEBUG) {
+     ini_set('display_errors',true);
+     error_reporting(E_ALL | E_STRICT);
+}
+//*/
+
+if (!defined('DC_DEBUG')) {
+     define('DC_DEBUG',false);
+}
+
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.3.1');
+define('DC_VERSION','2.4.0');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');
@@ -218 +221 @@
 $core->url->register('xmlrpc','xmlrpc','^xmlrpc/(.+)$',array('dcUrlHandlers','xmlrpc'));
 
-$core->setPostType('post','post.php?id=%d',$core->url->getBase('post').'/%s');
+$core->setPostType('post','post.php?id=%d',$core->url->getURLFor('post','%s'));
 
 # Store upload_max_filesize in bytes