Changeset 7214

Timestamp:

10/12/2021 10:09:28 PM (3 years ago)

Author:

johnjamesjacoby

Message:

Users: add some error checking to get_userdata() calls in profile link functions.

This change ensures that when attempting to link to user profiles when the display_name is the inner HTML of the link, that the "Anonymous" alternate is used whenever the user cannot be found.

It also bails early – returning false – if the user account simply does not exist, consistent with upstream calls to bbp_get_user_id(). (Functions calling these functions have a responsibility to appropriately handle boolean return values.)

In trunk, for 2.7.

Fixes #3440.

Location:

trunk/src/includes

Files:

• extend/buddypress/activity.php (modified) (2 diffs)
• users/template.php (modified) (2 diffs)

trunk/src/includes/extend/buddypress/activity.php

@@ -385 +385 @@
 
         // User link for topic author
-        $user_link = bbp_get_user_profile_link( $user_id  );
+        $user_link = bbp_get_user_profile_link( $user_id );
 
         // Topic
@@ -520 +520 @@
 
         // Setup links for activity stream
-        $user_link = bbp_get_user_profile_link( $user_id  );
+        $user_link = bbp_get_user_profile_link( $user_id );
 
         // Reply

trunk/src/includes/users/template.php

@@ -445 +445 @@
         }
 
-        $user      = get_userdata( $user_id );
-        $user_link = '<a href="' . esc_url( bbp_get_user_profile_url( $user_id ) ) . '">' . esc_html( $user->display_name ) . '</a>';
-
-        // Filter & return
-        return apply_filters( 'bbp_get_user_profile_link', $user_link, $user_id );
+        // Get the user
+        $user = get_userdata( $user_id );
+        if ( empty( $user ) ) {
+            return false;
+        }
+
+        // Display Name
+        $name = ! empty( $user->display_name )
+            ? $user->display_name
+            : bbp_get_fallback_display_name();
+
+        // URL
+        $url = bbp_get_user_profile_url( $user_id );
+
+        // Link
+        $link = ! empty( $url )
+            ? '<a href="' . esc_url( $url ) . '">' . esc_html( $name ) . '</a>'
+            : esc_html( $name );
+
+        // Filter & return
+        return (string) apply_filters( 'bbp_get_user_profile_link', $link, $user_id );
     }
 
@@ -597 +613 @@
         }
 
-        $user      = get_userdata( $user_id );
-        $edit_link = '<a href="' . esc_url( bbp_get_user_profile_edit_url( $user_id ) ) . '">' . esc_html( $user->display_name ) . '</a>';
-
-        // Filter & return
-        return apply_filters( 'bbp_get_user_profile_edit_link', $edit_link, $user_id );
+        // Get the user
+        $user = get_userdata( $user_id );
+        if ( empty( $user ) ) {
+            return false;
+        }
+
+        // Display Name
+        $name = ! empty( $user->display_name )
+            ? $user->display_name
+            : bbp_get_fallback_display_name();
+
+        // URL
+        $url = bbp_get_user_profile_edit_url( $user_id );
+
+        // Link
+        $link = ! empty( $url )
+            ? '<a href="' . esc_url( $url ) . '">' . esc_html( $name ) . '</a>'
+            : esc_html( $name );
+
+        // Filter & return
+        return (string) apply_filters( 'bbp_get_user_profile_edit_link', $link, $user_id );
     }