vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deprecate graceful_fail(). see #11644

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@12827 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2010-01-25 22:09:43 +00:00
parent d33c4ae2ca
commit 15e5d91692
4 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/ms-load.php
+9 -11
View File
@@ -91,26 +91,24 @@ function ms_site_check() {
return WP_CONTENT_DIR . '/blog-deleted.php';
} else {
header('HTTP/1.1 410 Gone');
graceful_fail(__('This user has elected to delete their account and the content is no longer available.'));
wp_die(__('This user has elected to delete their account and the content is no longer available.'));
}
} elseif ( '2' == $current_blog->deleted ) {
if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
return WP_CONTENT_DIR . '/blog-inactive.php';
else
wp_die( 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 ( '2' == $current_blog->deleted ) {
if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
return WP_CONTENT_DIR . '/blog-inactive.php';
} else {
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' || $current_blog->spam == '1' ) {
if ( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
return WP_CONTENT_DIR . '/blog-suspended.php';
} else {
header('HTTP/1.1 410 Gone');
graceful_fail(__('This blog has been archived or suspended.'));
wp_die(__('This blog has been archived or suspended.'));
}
}
return true;
}