summaryrefslogtreecommitdiffstats
path: root/wp-settings.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-06-09 11:14:46 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-06-09 11:14:46 +0000
commit616f7399dc4c4f7c56951c7b87a7aa91b3e690a3 (patch)
treede687a177456fe34d08c40a9ba5fe3738d2a174a /wp-settings.php
parentea7e2672ca23b81d1f79f60e077929433fe9ae77 (diff)
downloadwordpress-mu-616f7399dc4c4f7c56951c7b87a7aa91b3e690a3.tar.gz
wordpress-mu-616f7399dc4c4f7c56951c7b87a7aa91b3e690a3.tar.xz
wordpress-mu-616f7399dc4c4f7c56951c7b87a7aa91b3e690a3.zip
Move SHORTINIT, need apply_filters(), fixes #649
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1323 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
-rw-r--r--wp-settings.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/wp-settings.php b/wp-settings.php
index b81dc9a..ae9e40c 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -232,12 +232,13 @@ if ( defined('CUSTOM_USER_META_TABLE') )
if( !defined( "UPLOADS" ) )
define( "UPLOADS", "wp-content/blogs.dir/{$wpdb->blogid}/files/" );
-if( defined( "SHORTINIT" ) && constant( "SHORTINIT" ) == true ) // stop most of WP being loaded, we just want the basics
- return;
-
require (ABSPATH . WPINC . '/classes.php');
require (ABSPATH . WPINC . '/plugin.php');
require (ABSPATH . WPINC . '/default-filters.php');
+
+if( defined( "SHORTINIT" ) && constant( "SHORTINIT" ) == true ) // stop most of WP being loaded, we just want the basics
+ return;
+
include_once(ABSPATH . WPINC . '/streams.php');
include_once(ABSPATH . WPINC . '/gettext.php');
require_once (ABSPATH . WPINC . '/l10n.php');