Ticket #24061: 24061.3.diff

src/wp-includes/ms-load.php

@@ -56 +56 @@
 }
 
 /**
- * Checks status of current blog.
+ * Checks status of the current site.
  *
- * Checks if the blog is deleted, inactive, archived, or spammed.
+ * Checks if the site is marked as deleted, inactive, archived, or spammed.
  *
- * Dies with a default message if the blog does not pass the check.
+ * Dies with a default message if the site does not pass the check.
  *
- * To change the default message when a blog does not pass the check,
- * use the wp-content/blog-deleted.php, blog-inactive.php and
- * blog-suspended.php drop-ins.
+ * The ms_site_check_status action can be used to provide additional messaging.
+ * Drop-ins wp-content/blog-deleted.php, blog-inactive.php and blog-suspended.php
+ * can be used as well.
  *
  * @return bool|string Returns true on success, or drop-in file to include.
  */
 function ms_site_check() {
-        global $wpdb, $current_site;
+        global $current_site;
 
-        $blog = get_blog_details();
+        $site = get_blog_details();
 
         // Allow short-circuiting
         $check = apply_filters('ms_site_check', null);
@@ -82 +82 @@
         if ( is_super_admin() )
                 return true;
 
-        if ( '1' == $blog->deleted ) {
+        do_action( 'ms_site_check_status', $site );
+
+        if ( '1' == $site->deleted ) {
                 if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
                         return WP_CONTENT_DIR . '/blog-deleted.php';
                 else
@@ -89 +91 @@
                         wp_die( __( 'This user has elected to delete their account and the content is no longer available.' ), '', array( 'response' => 410 ) );
         }
 
-        if ( '2' == $blog->deleted ) {
+        if ( '2' == $site->deleted ) {
                 if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
                         return WP_CONTENT_DIR . '/blog-inactive.php';
                 else
@@ -96 +98 @@
                         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}" ) ) ) );
         }
 
-        if ( $blog->archived == '1' || $blog->spam == '1' ) {
+        if ( $site->archived == '1' || $site->spam == '1' ) {
                 if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
                         return WP_CONTENT_DIR . '/blog-suspended.php';
                 else