summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-08-29 12:42:47 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-08-29 12:42:47 +0000
commitc22edcead642e65ffe461dfbb54552d738c2e01f (patch)
tree46e6daf97dfe971965f89f632198246ef87eef95
parent52848077d54d4a57d9164cd3c4925c3ad44025a0 (diff)
downloadwordpress-mu-c22edcead642e65ffe461dfbb54552d738c2e01f.tar.gz
wordpress-mu-c22edcead642e65ffe461dfbb54552d738c2e01f.tar.xz
wordpress-mu-c22edcead642e65ffe461dfbb54552d738c2e01f.zip
Added 410 Gone error for deleted and spam blog, props selad, fixes #705
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1457 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r--wp-settings.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/wp-settings.php b/wp-settings.php
index 20be69e..cb9138c 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -332,17 +332,18 @@ if( is_dir( ABSPATH . MUPLUGINDIR ) ) {
}
$wpdb->show_errors();
-if ( '1' == $current_blog->deleted )
+if ( '1' == $current_blog->deleted ) {
+ header('HTTP/1.1 410 Gone');
graceful_fail(__('This user has elected to delete their account and the content is no longer available.'));
+}
if ( '2' == $current_blog->deleted )
graceful_fail( sprintf( __( 'This blog has not been activated yet. If you are having problems activating your blog, 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' )
- graceful_fail(__('This blog has been archived or suspended.'));
-
-if( $current_blog->spam == '1' )
- graceful_fail(__('This blog has been archived or suspended.'));
+if( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
+ header('HTTP/1.1 410 Gone');
+ graceful_fail(__('This blog has been archived or suspended.'));
+}
/**
* Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php