summaryrefslogtreecommitdiffstats
path: root/wp-includes/pluggable.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-12-04 15:51:16 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-12-04 15:51:16 +0000
commit2f2c360db1381ff7c8f664f2e91d8688581252d4 (patch)
tree10154c5d71532a1f87cf0510930017e42e40d795 /wp-includes/pluggable.php
parent251e06d3943ea8268c6766f3441a86fac46cecac (diff)
downloadwordpress-mu-2f2c360db1381ff7c8f664f2e91d8688581252d4.tar.gz
wordpress-mu-2f2c360db1381ff7c8f664f2e91d8688581252d4.tar.xz
wordpress-mu-2f2c360db1381ff7c8f664f2e91d8688581252d4.zip
Return "Blog suspended" message only if blog marked as spam, fixes #515
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1169 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/pluggable.php')
-rw-r--r--wp-includes/pluggable.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 4fd64e1..8ce2985 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -341,7 +341,7 @@ function wp_login($username, $password, $already_md5 = false) {
} else {
if( is_site_admin( $username ) == false && ( $primary_blog = get_usermeta( $login->ID, "primary_blog" ) ) ) {
$details = get_blog_details( $primary_blog );
- if( is_object( $details ) && $details->archived == 1 || $details->spam == 1 || $details->deleted == 1 ) {
+ if( is_object( $details ) && $details->spam == 1 ) {
$error = __('<strong>Error</strong>: Blog suspended.');
return false;
}