Changeset 10585 for sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-user-tweaks.php

Timestamp:

01/15/2021 05:55:03 AM (4 years ago)

Author:

dd32

Message:

User Tweaks: Use the user nicename for blocked users, rather than the contents of the display_name field which may be set to something not display friendly.

See #5578.

File:

• sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-user-tweaks.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-user-tweaks.php

@@ -1 +1 @@
 <?php
+namespace WordPressdotorg\User_Tweaks;
+use WP_User;
+use add_filter;
+
 /**
  * Plugin Name: W.org User Tweaks
@@ -5 +9 @@
 
 // Some users have an empty display_name field, which shouldn't happen but does due to sanitization.
-add_filter( 'user_display_name', function( $name, $user_id ) {
+add_filter( 'user_display_name', function( $name, $user_id, $context ) {
+    if ( 'edit' === $context ) {
+        return $name;
+    }
+
     if ( '' === $name ) {
         $name = get_user_by( 'id', $user_id )->user_nicename;
     }
 
+    $name = maybe_replace_blocked_user_name( $name, $user_id );
+
     return $name;
-}, 1, 2 );
+}, 1, 3 );
 
 // bbPress skips user filtering and does it's own
-add_filter( 'bbp_get_displayed_user_field', function( $value, $field ) {
-    if ( 'display_name' === $field && '' === $value ) {
-        $value = bbpress()->displayed_user->user_nicename;
+add_filter( 'bbp_get_displayed_user_field', function( $value, $field, $filter ) {
+    if ( 'edit' === $filter ) {
+        return $value;
+    }
+
+    if ( 'display_name' === $field ) {
+        if ( '' === $value ) {
+            $value = bbpress()->displayed_user->user_nicename;
+        }
+
+        $value = maybe_replace_blocked_user_name( $value, bbpress()->displayed_user );
     }
 
     return $value;
-}, 1, 2 );
+}, 1, 3 );
 
 /**
@@ -34 +52 @@
     }
 
+    // Intentionally not used, as this will override in edit contexts too.
+    //$wp_user->display_name = maybe_replace_blocked_user_name( $wp_user->display_name, $wp_user );
+
     return $allcaps;
 }, 1, 4 );
+
+/**
+ * Use the nicename field for blocked users.
+ */
+function maybe_replace_blocked_user_name( $name, $user ) {
+    if ( ! defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) ) {
+        return $name;
+    }
+
+    $user_id = is_object( $user ) ? $user->ID : $user;
+    if ( ! $user_id ) {
+        return $name;
+    }
+
+    if ( ! ( $user instanceof WP_User ) ) {
+        $user = get_user_by( 'id', $user );
+    }
+
+    if ( ! $user ) {
+        return $name;
+    }
+
+    $user->for_site( WPORG_SUPPORT_FORUMS_BLOGID );
+
+    /* Cannot use $user->has_cap( 'bbp_blocked' ), as we may be within a capability filter. */
+    if ( !empty( $user->roles ) && in_array( 'bbp_blocked', $user->roles ) ) {
+        return $user->user_nicename;
+    }
+
+    return $name;
+}