diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-25 16:17:51 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-25 16:17:51 +0000 |
| commit | 2841bbfd327625d091217599d9331ccc9d0d1739 (patch) | |
| tree | 910edfd132799a277d86c4ee776c32de1fcb87b2 /wp-settings.php | |
| parent | 1d82df4e5f5642ea93c1d8216f7012b3e236e087 (diff) | |
| download | wordpress-mu-2841bbfd327625d091217599d9331ccc9d0d1739.tar.gz wordpress-mu-2841bbfd327625d091217599d9331ccc9d0d1739.tar.xz wordpress-mu-2841bbfd327625d091217599d9331ccc9d0d1739.zip | |
Minor changes, props momo360modena, #719
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1449 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
| -rw-r--r-- | wp-settings.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-settings.php b/wp-settings.php index 941ac53..ad10e47 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -247,7 +247,7 @@ require (ABSPATH . WPINC . '/plugin.php'); require (ABSPATH . WPINC . '/default-filters.php'); if( defined( "SHORTINIT" ) && constant( "SHORTINIT" ) == true ) // stop most of WP being loaded, we just want the basics - return; + return false; include_once(ABSPATH . WPINC . '/streams.php'); include_once(ABSPATH . WPINC . '/gettext.php'); @@ -335,7 +335,7 @@ if ( '1' == $current_blog->deleted ) 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}" ) ) ) ); + 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.')); |