WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace get_user_id_from_string() with get_user_by(). props ocean90, bananastalktome. fixes #23192. see #23190. 

git-svn-id: http://core.svn.wordpress.org/trunk@23431 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2013-02-15 18:00:52 +00:00
parent 2312092aad
commit df725c13c0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1733,21 +1733,19 @@ function fix_phpmailer_messageid( $phpmailer ) {
* Check to see whether a user is marked as a spammer, based on username
*
* @since MU
* @uses get_current_user_id()
* @uses get_user_id_from_string()
* @uses get_user_by()
*
* @param string $username
* @return bool
*/
function is_user_spammy( $username = 0 ) {
if ( $username == 0 ) {
$user_id = get_current_user_id();
$user = get_user_by( 'id', get_current_user_id() );
} else {
$user_id = get_user_id_from_string( $username );
$user = get_user_by( 'login', $username );
}
$u = get_userdata( $user_id );
return ( isset( $u->spam ) && $u->spam == 1 );
return ( isset( $user->spam ) && $user->spam == 1 );
}
/**