Changeset 7348 for trunk/bp-members/bp-members-functions.php

Timestamp:

08/12/2013 10:41:46 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Update bp_core_get_username() to check explicit false return on wp_cache_get() per best practices.

File:

• trunk/bp-members/bp-members-functions.php (modified) (2 diffs)

trunk/bp-members/bp-members-functions.php

@@ -216 +216 @@
  * @package BuddyPress Core
  * @param int $uid User ID to check.
- * @global $userdata WordPress user data for the current logged in user.
- * @uses get_userdata() WordPress function to fetch the userdata for a user ID
+ * @uses bp_core_get_core_userdata() Fetch the userdata for a user ID
  * @return string|bool The username of the matched user, or false.
  */
-function bp_core_get_username( $user_id, $user_nicename = false, $user_login = false ) {
-    global $bp;
-
-    if ( !$username = wp_cache_get( 'bp_user_username_' . $user_id, 'bp' ) ) {
+function bp_core_get_username( $user_id = 0, $user_nicename = false, $user_login = false ) {
+    $bp = buddypress();
+
+    // Check cache for user nicename
+    $username = wp_cache_get( 'bp_user_username_' . $user_id, 'bp' );
+    if ( false === $username ) {
 
         // Cache not found so prepare to update it
@@ -270 +271 @@
 
     // Check $username for empty spaces and default to nicename if found
-    if ( strstr( $username, ' ' ) )
+    if ( strstr( $username, ' ' ) ) {
         $username = bp_members_get_user_nicename( $user_id );
+    }
 
     // Add this to cache
-    if ( ( true == $update_cache ) && !empty( $username ) )
+    if ( ( true === $update_cache ) && !empty( $username ) ) {
         wp_cache_set( 'bp_user_username_' . $user_id, $username, 'bp' );
+
+    // @todo bust this cache if no $username found?
+    //} else {
+    //  wp_cache_delete( 'bp_user_username_' . $user_id );
+    }
 
     return apply_filters( 'bp_core_get_username', $username );