diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-08-08 08:28:50 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-08-08 08:28:50 +0000 |
| commit | f18cbe5610c329d60c795037ededfbb2363618f3 (patch) | |
| tree | d088e725d2443fc54aacecf74460700b4d8002b4 /wp-settings.php | |
| parent | 472560f7f990646539bd09e70052cbc245505104 (diff) | |
| download | wordpress-mu-f18cbe5610c329d60c795037ededfbb2363618f3.tar.gz wordpress-mu-f18cbe5610c329d60c795037ededfbb2363618f3.tar.xz wordpress-mu-f18cbe5610c329d60c795037ededfbb2363618f3.zip | |
Move PLUGINDIR definition down so it can be set by an MU plugin if needed, props mysorehead, fixes #372
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1026 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
| -rw-r--r-- | wp-settings.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-settings.php b/wp-settings.php index e5d13c2..72a534e 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -100,8 +100,6 @@ if ( !defined('LANGDIR') ) { define('LANGDIR', WPINC . '/languages'); // no leading slash, no trailing slash } -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'); else @@ -266,6 +264,8 @@ if ( !defined('COOKIE_DOMAIN') ) 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'); if ( is_array($current_plugins) ) { |