WordPress.org

Make WordPress Core

Ticket #21306: 21306-0.diff

File 21306-0.diff, 851 bytes (added by amattie, 3 years ago)

Archived blogs should respond with 403 Forbidden, not 410 Gone

  • wp-includes/ms-load.php

     
    9696 
    97         if ( $current_blog->archived == '1' || $current_blog->spam == '1' ) { 
     97        if ( '1' == $current_blog->spam ) { 
    9898                if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) 
     
    100100                else 
    101                         wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) ); 
     101                        wp_die( __( 'This site has been suspended.' ), '', array( 'response' => 410 ) ); 
     102        } 
     103 
     104        if ( '1' == $current_blog->archived ) { 
     105                if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) 
     106                        return WP_CONTENT_DIR . '/blog-suspended.php'; 
     107                else 
     108                        wp_die( __( 'This site has been archived.' ), '', array( 'response' => 403 ) ); 
    102109        }