Wordpress 3.6

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

diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index 6a26b9cf06a2772428c4f04c3d0a007dddacb877..55659a2822c2dbc8a51a8363aa61e08f351d0b47 100644 (file)
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -69,7 +69,7 @@ function wp_get_active_network_plugins() {
  * @return bool|string Returns true on success, or drop-in file to include.
  */
 function ms_site_check() {
-       global $wpdb;
+       global $wpdb, $current_site;
 
        $blog = get_blog_details();
 
@@ -240,7 +240,7 @@ function ms_not_installed() {
                die( $msg );
        $msg .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '';
        $msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
-       if ( false && !$wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) )
+       if ( ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) )
                $msg .= '<p>' . sprintf( __( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted <code>%s</code>. You really should look at your database now.' ), $wpdb->site ) . '</p>';
        else
                $msg .= '<p>' . sprintf( __( '<strong>Could not find site <code>%1$s</code>.</strong> Searched for table <code>%2$s</code> in database <code>%3$s</code>. Is that right?' ), rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '</p>';