From 2f2c360db1381ff7c8f664f2e91d8688581252d4 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 4 Dec 2007 15:51:16 +0000
Subject: 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
---
 wp-includes/pluggable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wp-includes/pluggable.php')

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;
 			}
-- 
cgit