Changeset 12879

Timestamp:

01/27/2010 06:11:17 PM (15 years ago)

Author:

ryan

Message:

Integrate wordpressmu_authenticate_siteadmin() into wp_authenticate_username_password(). see #11644

Location:

trunk/wp-includes

Files:

• ms-default-filters.php (modified) (1 diff)
• ms-functions.php (modified) (1 diff)
• user.php (modified) (1 diff)

trunk/wp-includes/ms-default-filters.php

@@ -3 +3 @@
 add_filter ( 'wpmu_validate_user_signup', 'signup_nonce_check' );
 add_action ( 'init', 'maybe_add_existing_user_to_blog' );
-add_filter ( 'wp_authenticate_user', 'wordpressmu_authenticate_siteadmin', 10, 2 );
 add_action ( 'wpmu_new_user', 'newuser_notify_siteadmin' );
 add_action ( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );

trunk/wp-includes/ms-functions.php

@@ -1748 +1748 @@
 }
 
-function wordpressmu_authenticate_siteadmin( $user, $password = '' ) {
-    if ( is_super_admin( $user->user_login ) == false && ( $primary_blog = get_usermeta( $user->user_id, "primary_blog" ) ) ) {
-        $details = get_blog_details( $primary_blog );
-        if ( is_object( $details ) && $details->spam == 1 )
-            return new WP_Error('blog_suspended', __('Blog Suspended.'));
-    }
-    return $user;
-}
-
 function wordpressmu_wp_mail_from( $email ) {
     if ( strpos( $email, 'wordpress@' ) !== false )

trunk/wp-includes/user.php

@@ -89 +89 @@
         return new WP_Error('invalid_username', sprintf(__('<strong>ERROR</strong>: Invalid username. <a href="%s" title="Password Lost and Found">Lost your password</a>?'), site_url('wp-login.php?action=lostpassword', 'login')));
 
-    if ( is_multisite() && (1 == $userdata->spam) )
-        return new WP_Error('invalid_username', __('<strong>ERROR</strong>: Your account has been marked as a spammer.'));
+    if ( is_multisite() ) {
+        // Is user marked as spam?
+        if ( 1 == $userdata->spam)
+            return new WP_Error('invalid_username', __('<strong>ERROR</strong>: Your account has been marked as a spammer.'));
+
+        // Is a user's blog marked as spam?
+        if ( !is_super_admin( $userdata->ID ) && isset($userdata->primary_blog) ) {
+            $details = get_blog_details( $userdata->primary_blog );
+            if ( is_object( $details ) && $details->spam == 1 )
+                return new WP_Error('blog_suspended', __('Blog Suspended.'));
+        }
+    }
 
     $userdata = apply_filters('wp_authenticate_user', $userdata, $password);