Skip to content

Fix: Only propagate user spam status to sites where user is the registered admin #11587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Sukhendu2002 wants to merge 2 commits into
base: trunk
Choose a base branch
from
+16 −7
Draft

Fix: Only propagate user spam status to sites where user is the registered admin #11587

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40a95f7
Networks and Sites: Only propagate user spam status to admin-owned sites
Sukhendu2002 Apr 16, 2026
3653db3
Merge branch 'trunk' into fix/20774-spam-propagation-admin-email
Sukhendu2002 Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/wp-admin/network/users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,15 @@
*/
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' );
// Do not mark the main site as spam, and only affect the current network.
if ( is_main_site( $details->userblog_id ) || get_current_network_id() !== $details->site_id ) {
continue;
}
// Only mark sites where the user is the registered site admin.
if ( get_blog_option( $details->userblog_id, 'admin_email' ) !== $user->user_email ) {
continue;
}
update_blog_status( $details->userblog_id, 'spam', '1' );
}
}

Expand All @@ -131,15 +136,19 @@
}

$userfunction = 'all_notspam';
$blogs = get_blogs_of_user( $user_id, true );

/** 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' );
// Do not unmark the main site as spam, and only affect the current network.
if ( is_main_site( $details->userblog_id ) || get_current_network_id() !== $details->site_id ) {
continue;
}
// Only unmark sites where the user is the registered site admin.
if ( get_blog_option( $details->userblog_id, 'admin_email' ) !== $user->user_email ) {
continue;
}
update_blog_status( $details->userblog_id, 'spam', '0' );
}
}

Expand Down
Loading