WordPress 3.8.3

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

diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index 55659a2822c2dbc8a51a8363aa61e08f351d0b47..09746dbd75115e475e6a186f2d2a95a831c260e5 100644 (file)
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -66,15 +66,21 @@ function wp_get_active_network_plugins() {
  * use the wp-content/blog-deleted.php, blog-inactive.php and
  * blog-suspended.php drop-ins.
  *
+ * @since 3.0.0
+ *
  * @return bool|string Returns true on success, or drop-in file to include.
  */
 function ms_site_check() {
-       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 3.0.0
+        *
+        * @param bool null Whether to skip the blog status check. Default null.
+       */
+       $check = apply_filters( 'ms_site_check', null );
        if ( null !== $check )
                return true;
 
@@ -93,7 +99,7 @@ function ms_site_check() {
                if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
                        return WP_CONTENT_DIR . '/blog-inactive.php';
                else
-                       wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) );
+                       wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
        }
 
        if ( $blog->archived == '1' || $blog->spam == '1' ) {