Changeset 10586

Timestamp:

01/15/2021 06:14:21 AM (2 years ago)

Author:

dd32

Message:

User Tweaks: Add BuddyPress support.

See #5578.

File:

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

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

@@ -41 +41 @@
 
 /**
+ * Filter the BuddyPress displayed name.
+ */
+add_filter( 'bp_displayed_user_fullname', function( $name ) { 
+    if ( '' === $name ) {
+        buddypress()->displayed_user->user_nicename;
+    }
+
+    $name = maybe_replace_blocked_user_name( $name, buddypress()->displayed_user );
+
+    return $name;
+} );
+
+/**
  * Some users have an empty display_name field, which shouldn't happen, but does due to sanitization.
  *
@@ -62 +75 @@
  */
 function maybe_replace_blocked_user_name( $name, $user ) {
-    if ( ! defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) ) {
+    if ( ! ( $user instanceof WP_User ) ) {
+        if ( ! empty( $user->ID ) ) {
+            $user_id = $user->ID;
+        } elseif ( !empty( $user->id ) ) {
+            $user_id = $user->id;
+        } else {
+            $user_id = $user;
+        }
+
+        $user = get_user_by( 'id', $user_id );
+    }
+
+    if ( ! $user || ! $user->exists() ) {
         return $name;
     }
 
-    $user_id = is_object( $user ) ? $user->ID : $user;
-    if ( ! $user_id ) {
-        return $name;
+    // If it's a recently blocked user, it'll have a broken user_pass, use that.
+    if ( 'BLOCKED' === substr( $user->user_pass, 0, 7 ) ) {
+        return $user->user_nicename;
     }
 
-    if ( ! ( $user instanceof WP_User ) ) {
-        $user = get_user_by( 'id', $user );
+    if ( defined( 'WPORG_SUPPORT_FORUMS_BLOGID' ) ) {
+        $user->for_site( WPORG_SUPPORT_FORUMS_BLOGID );
     }
 
-    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 ) ) {
+    // Cannot use $user->has_cap( 'bbp_blocked' ), as we may be within a capability filter.
+    // Only works on the WordPress.org network.
+    if ( ! empty( $user->roles ) && in_array( 'bbp_blocked', $user->roles ) ) {
         return $user->user_nicename;
     }