Changeset 16906 for trunk/wp-includes/ms-load.php

Timestamp:

12/14/2010 08:38:01 AM (14 years ago)

Author:

PeteMall

Message:

Ensure correct HTTP status code is returned. Props nacin, fixes #15799

File:

• trunk/wp-includes/ms-load.php (modified) (2 diffs)

trunk/wp-includes/ms-load.php

@@ -82 +82 @@
 
     if ( '1' == $current_blog->deleted ) {
-        if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
+        if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
             return WP_CONTENT_DIR . '/blog-deleted.php';
-        } else {
-            header( 'HTTP/1.1 410 Gone' );
-            wp_die( /*WP_I18N_USER_DELETED_BLOG*/'This user has elected to delete their account and the content is no longer available.'/*/WP_I18N_USER_DELETED_BLOG*/ );
-        }
+        else
+            wp_die( __( 'This user has elected to delete their account and the content is no longer available.' ), '', array( 'response' => 410 ) );
     }
 
@@ -94 +92 @@
             return WP_CONTENT_DIR . '/blog-inactive.php';
         else
-            wp_die( sprintf( /*WP_I18N_BLOG_NOT_ACTIVATED*/'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>.'/*/WP_I18N_BLOG_NOT_ACTIVATED*/, 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@{$current_site->domain}" ) ) ) );
     }
 
     if ( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
-        if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
+        if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
             return WP_CONTENT_DIR . '/blog-suspended.php';
-        } else {
-            header( 'HTTP/1.1 410 Gone' );
-            wp_die( /*WP_I18N_ARCHIVED*/'This site has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ );
-        }
+        else
+            wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
     }