X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5964d2279dc52bdfe105f9bfa17e04337d47a3fa..cc5aa27dd564435b195ea084fa46b3069e78bbff:/wp-includes/ms-load.php

diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index 6a26b9cf..a8f3f378 100644
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -69,12 +69,18 @@ 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();
 
-	// Allow short-circuiting
-	$check = apply_filters('ms_site_check', null);
+	/**
+	 * Filter checking the status of the current blog.
+	 *
+	 * @since 1.2.1
+	 *
+	 * @param bool null Whether to skip the blog status check. Default null.
+	*/
+	$check = apply_filters( 'ms_site_check', null );
 	if ( null !== $check )
 		return true;
 
@@ -240,7 +246,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>';