Merged changes from WP SVN.

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@22 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 13 insertions, 5 deletions

diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php
index 1c96dfd..2eaca73 100644
--- a/wp-inst/wp-settings.php
+++ b/wp-inst/wp-settings.php
@@ -201,16 +201,24 @@ $_POST   = add_magic_quotes($_POST  );
 $_COOKIE = add_magic_quotes($_COOKIE);
 $_SERVER = add_magic_quotes($_SERVER);
 
-function shutdown_action_hook() {
-	do_action('shutdown');
-}
-register_shutdown_function('shutdown_action_hook');
-
 $wp_query = new WP_Query();
 $wp_rewrite = new WP_Rewrite();
 $wp = new WP();
 $wp_roles = new WP_Roles();
 
+define('TEMPLATEPATH', get_template_directory());
+
+// Load the default text localization domain.
+load_default_textdomain();
+
+// Pull in locale data after loading text domain.
+require_once(ABSPATH . WPINC . '/locale.php');
+
+function shutdown_action_hook() {
+	do_action('shutdown');
+}
+register_shutdown_function('shutdown_action_hook');
+
 // Everything is loaded and initialized.
 do_action('init');
 ?>