Changeset 45874

Timestamp:

08/22/2019 01:52:16 AM (6 years ago)

Author:

SergeyBiryukov

Message:

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.

Add a unit test.

Props azaozz, SergeyBiryukov.
Fixes #45747.

Location:

trunk

Files:

• src/wp-includes/user.php (modified) (1 diff)
• tests/phpunit/tests/user.php (modified) (1 diff)

trunk/src/wp-includes/user.php

@@ -1666 +1666 @@
     $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.' ) );
     }

trunk/tests/phpunit/tests/user.php

@@ -576 +576 @@
 
     /**
+     * @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
      */