IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2010-01-27 18:11:17 +00:00
parent fc204c952d
commit 65ac9b6827
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/ms-functions.php
View File

@@ -1747,15 +1747,6 @@ function upload_is_file_too_big( $upload ) {
return $upload;
}
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 )
$email = get_option( 'admin_email' );