Ticket #21306: 21306-0.diff

wp-includes/ms-load.php

@@ -96 +96 @@
 
-        if ( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
+        if ( '1' == $current_blog->spam ) {
                 if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
@@ -100 +100 @@
                 else
-                        wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+                        wp_die( __( 'This site has been suspended.' ), '', array( 'response' => 410 ) );
+        }
+
+        if ( '1' == $current_blog->archived ) {
+                if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
+                        return WP_CONTENT_DIR . '/blog-suspended.php';
+                else
+                        wp_die( __( 'This site has been archived.' ), '', array( 'response' => 403 ) );
         }