WordPress 3.8.1

[autoinstalls/wordpress.git] / wp-includes / ms-settings.php

diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
index 42df103d41bef47ad422a65ec46fe812de0a0000..af2ea0d97add9b602747d782ec646bf487c00eb8 100644 (file)
--- a/wp-includes/ms-settings.php
+++ b/wp-includes/ms-settings.php
@@ -31,7 +31,8 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
                        $domain = substr( $domain, 0, -4 );
                        $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
                } else {
-                       wp_die( /*WP_I18N_NO_PORT_NUMBER*/'Multisite only works without the port number in the URL.'/*/WP_I18N_NO_PORT_NUMBER*/ );
+                       wp_load_translations_early();
+                       wp_die( __( 'Multisite only works without the port number in the URL.' ) );
                }
        }
 
@@ -116,14 +117,17 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
                if ( defined( 'WP_INSTALLING' ) ) {
                        $current_blog->blog_id = $blog_id = 1;
                } else {
-                       $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . /*WP_I18N_TABLES_MISSING*/'Database tables are missing.'/*/WP_I18N_TABLES_MISSING*/ : '';
-                       wp_die( /*WP_I18N_NO_BLOG*/'No site by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg );
+                       wp_load_translations_early();
+                       $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';
+                       wp_die( __( 'No site by that name on this system.' ) . $msg );
                }
        }
 }
 $wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php
 $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
 $table_prefix = $wpdb->get_blog_prefix();
+$_wp_switched_stack = array();
+$switched = false;
 
 // need to init cache again after blog_id is set
 wp_start_object_cache();