sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Users: Adjust [45708] to make sure wp_update_user() does not issue a WP_Error if a single site was previously set up as Multisite and there's still a spam field in the user table.

Browse Source 
Add a unit test.

Props azaozz, SergeyBiryukov.
Fixes #45747.

git-svn-id: https://develop.svn.wordpress.org/trunk@45874 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-08-22 01:52:16 +00:00
parent 7fbabd505d
commit 1ba44554be
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/user.php
View File

@ -1665,7 +1665,7 @@ function wp_insert_user( $userdata ) {
$user_activation_key = empty( $userdata['user_activation_key'] ) ? '' : $userdata['user_activation_key']; $user_activation_key = empty( $userdata['user_activation_key'] ) ? '' : $userdata['user_activation_key'];
if ( isset( $userdata['spam'] ) && ! is_multisite() ) { if ( ! empty( $userdata['spam'] ) && ! is_multisite() ) {
return new WP_Error( 'no_spam', __( 'Sorry, marking a user as spam is only supported on Multisite.' ) ); return new WP_Error( 'no_spam', __( 'Sorry, marking a user as spam is only supported on Multisite.' ) );
} }

28
tests/phpunit/tests/user.php
View File

@ -574,6 +574,34 @@ class Tests_User extends WP_UnitTestCase {
$this->assertEquals( $pwd_before, $pwd_after ); $this->assertEquals( $pwd_before, $pwd_after );
} }
/**
* @ticket 45747
*/
function test_wp_update_user_should_not_mark_user_as_spam_on_single_site() {
if ( is_multisite() ) {
$this->markTestSkipped( 'This test is intended for single site.' );
}
$u = wp_update_user(
array(
'ID' => self::$contrib_id,
'spam' => '0',
)
);
$this->assertNotWPError( $u );
$u = wp_update_user(
array(
'ID' => self::$contrib_id,
'spam' => '1',
)
);
$this->assertWPError( $u );
$this->assertSame( 'no_spam', $u->get_error_code() );
}
/** /**
* @ticket 28315 * @ticket 28315
*/ */