Changeset 61660

Timestamp:

02/17/2026 09:24:56 AM (5 weeks ago)

Author:

audrasjb

Message:

Networks and Sites: Don't automatically mark website as spam when an account is marked as spam.

This changeset does the following:

• Explicitly add 403 to wp_die() calls for unauthorized actions
• Introduce the network_user_spam_propagate_to_blogs filter to provide flexibility for developers to control spam status propagation
• Use is_super_admin() checks for both "spam" and "notspam" actions to prevent unauthorized modification of network administrators
• Refine the "notspam" logic to ensure that blog status updates are correctly scoped to the current network
• Add related unit tests coverage

Props ignatiusjeroe, realloc, johnjamesjacoby, westonruter, mukesh27, pratiknawkar94, anukasha.
Fixes #61146.

Location:

trunk

Files:

• src/wp-admin/network/users.php (modified) (2 diffs)
• tests/phpunit/tests/user.php (modified) (1 diff)

trunk/src/wp-admin/network/users.php

@@ -87 +87 @@
                                             __( 'Warning! User cannot be modified. The user %s is a network administrator.' ),
                                             esc_html( $user->user_login )
-                                        )
+                                        ),
+                                        403
                                     );
                                 }
 
                                 $userfunction = 'all_spam';
-                                $blogs        = get_blogs_of_user( $user_id, true );
-
-                                foreach ( (array) $blogs as $details ) {
-                                    if ( ! is_main_site( $details->userblog_id ) ) { // Main site is not a spam!
-                                        update_blog_status( $details->userblog_id, 'spam', '1' );
+
+                                /**
+                                 * Filters whether to propagate the blog status when a user is marked as spam.
+                                 *
+                                 * @since 7.0.0
+                                 *
+                                 * @param bool $propagate Whether to propagate the blog status. Default false.
+                                 * @param int  $user_id   User ID.
+                                 */
+                                if ( apply_filters( 'propagate_network_user_spam_to_blogs', false, $user_id ) ) {
+                                    foreach ( get_blogs_of_user( $user_id, true ) as $details ) {
+                                        // Assuming the main site is not a spam.
+                                        if ( ! is_main_site( $details->userblog_id ) ) {
+                                            update_blog_status( $details->userblog_id, 'spam', '1' );
+                                        }
                                     }
                                 }
@@ -109 +120 @@
                                 $user = get_userdata( $user_id );
 
+                                if ( is_super_admin( $user->ID ) ) {
+                                    wp_die(
+                                        sprintf(
+                                            /* translators: %s: User login. */
+                                            __( 'Warning! User cannot be modified. The user %s is a network administrator.' ),
+                                            esc_html( $user->user_login )
+                                        ),
+                                        403
+                                    );
+                                }
+
                                 $userfunction = 'all_notspam';
                                 $blogs        = get_blogs_of_user( $user_id, true );
 
-                                foreach ( (array) $blogs as $details ) {
-                                    update_blog_status( $details->userblog_id, 'spam', '0' );
+                                /** This filter is documented in wp-admin/network/users.php */
+                                if ( apply_filters( 'propagate_network_user_spam_to_blogs', false, $user_id ) ) {
+                                    foreach ( get_blogs_of_user( $user_id, true ) as $details ) {
+                                        if ( ! is_main_site( $details->userblog_id ) && get_current_network_id() === $details->site_id ) {
+                                            // Assuming main site is never a spam and part of the current network.
+                                            update_blog_status( $details->userblog_id, 'spam', '0' );
+                                        }
+                                    }
                                 }
 

trunk/tests/phpunit/tests/user.php

@@ -885 +885 @@
 
     /**
+     * Helper to create a user and add them to multiple blogs.
+     *
+     * @param int  $num_blogs          Number of additional blogs to create and add the user to.
+     * @param bool $include_main_site  Whether to add the user to the main site as well.
+     * @return array Array with 'user_id' and 'blogs' (array of blog IDs).
+     */
+    private function create_user_with_blogs( $num_blogs = 1, $include_main_site = false ) {
+        $user_id = self::factory()->user->create();
+
+        $blogs = array();
+        if ( $include_main_site ) {
+            add_user_to_blog( get_main_site_id(), $user_id, 'administrator' );
+            $blogs[] = get_main_site_id();
+        }
+
+        for ( $i = 0; $i < $num_blogs; $i++ ) {
+            $blog_id = self::factory()->blog->create(
+                array(
+                    'site_id' => get_current_network_id(),
+                )
+            );
+            add_user_to_blog( $blog_id, $user_id, 'administrator' );
+            $blogs[] = $blog_id;
+        }
+
+        return array(
+            'user_id' => $user_id,
+            'blogs'   => $blogs,
+        );
+    }
+
+    /**
+     * @ticket 61146
+     */
+    public function test_default_do_not_propagate_network_user_spam_to_blogs_on_multisite() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'This test is for multisite only.' );
+        }
+
+        $data    = $this->create_user_with_blogs( 2 );
+        $user_id = $data['user_id'];
+        $blogs   = $data['blogs'];
+
+        // Mark user spam in user record (this alone should not change blog spam states).
+        $u = wp_update_user(
+            array(
+                'ID'   => $user_id,
+                'spam' => '1',
+            )
+        );
+        $this->assertNotWPError( $u );
+        $user = get_userdata( $user_id );
+        $this->assertSame( '1', $user->spam );
+
+        foreach ( $blogs as $blog_id ) {
+            $this->assertNotSame( '1', get_blog_status( $blog_id, 'spam' ), "Blog {$blog_id} should not be marked spam by default." );
+        }
+    }
+
+    /**
      * @ticket 28315
      */