Changeset 1026

Timestamp:

08/08/07 08:28:50 (1 year ago)

Author:

donncha

Message:

Move PLUGINDIR definition down so it can be set by an MU plugin if needed, props mysorehead, fixes #372

Files:

• trunk/wp-settings.php (modified) (2 diffs)

trunk/wp-settings.php

@@ -101 +101 @@
-}
-
-if ( !defined('PLUGINDIR') )
-        define('PLUGINDIR', 'wp-content/plugins'); // no leading slash, no trailing slash
-if ( file_exists(ABSPATH . 'wp-content/db.php') )
-        require (ABSPATH . 'wp-content/db.php');
@@ -267 +265 @@
-require (ABSPATH . WPINC . '/vars.php');
-
+if ( !defined('PLUGINDIR') )
+        define('PLUGINDIR', 'wp-content/plugins'); // no leading slash, no trailing slash
-if ( get_option('active_plugins') ) {
-        $current_plugins = get_option('active_plugins');