summaryrefslogtreecommitdiffstats
path: root/wp-settings.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-18 11:27:26 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-18 11:27:26 +0000
commitacdcdacc2fe65422a3f52e3320283feba13d9c40 (patch)
treebad2b7ef0aef1f89e9abc6bafa0264a3ba302f46 /wp-settings.php
parent26b0392f7796ed87daa7725a33ac87057b3b2a4c (diff)
downloadwordpress-mu-acdcdacc2fe65422a3f52e3320283feba13d9c40.tar.gz
wordpress-mu-acdcdacc2fe65422a3f52e3320283feba13d9c40.tar.xz
wordpress-mu-acdcdacc2fe65422a3f52e3320283feba13d9c40.zip
WP Merge to rev 4763
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@851 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
-rw-r--r--wp-settings.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/wp-settings.php b/wp-settings.php
index f39ec9a..6ca0163 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -158,10 +158,8 @@ if( defined( "SHORTINIT" ) && constant( "SHORTINIT" ) == true ) // stop most of
require (ABSPATH . WPINC . '/functions.php');
require (ABSPATH . WPINC . '/plugin.php');
require (ABSPATH . WPINC . '/default-filters.php');
-
-include_once(ABSPATH . 'wp-includes/streams.php');
-include_once(ABSPATH . 'wp-includes/gettext.php');
-
+include_once(ABSPATH . WPINC . '/streams.php');
+include_once(ABSPATH . WPINC . '/gettext.php');
require_once (ABSPATH . WPINC . '/l10n.php');
$wpdb->hide_errors();