Changeset 2335

Timestamp:

01/18/2010 01:57:03 PM (16 years ago)

Author:

apeatling

Message:

Fixes #1594 - member profile link error. Props grimbog.

File:

• trunk/bp-core.php (modified) (8 diffs)

trunk/bp-core.php

@@ -547 +547 @@
 
         /* Cache the link */
-        wp_cache_set( 'bp_user_domain_' . $user_id, $domain, 'bp' );
+        if ( !empty( $domain ) )
+            wp_cache_set( 'bp_user_domain_' . $user_id, $domain, 'bp' );
     }
 
@@ -987 +988 @@
  * @return str the username of the matched user.
  */
-function bp_core_get_username( $uid, $user_nicename = false, $user_login = false ) {
-    global $bp;
-
-    if ( !$username = wp_cache_get( 'bp_user_username_' . $uid, 'bp' ) ) {
+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' ) ) {
         if ( empty( $user_nicename ) && empty( $user_login ) ) {
             $ud = false;
 
-            if ( $bp->loggedin_user->id == $uid )
+            if ( $bp->loggedin_user->id == $user_id )
                 $ud = &$bp->loggedin_user->userdata;
 
-            if ( $bp->displayed_user->id == $uid )
+            if ( $bp->displayed_user->id == $user_id )
                 $ud = &$bp->displayed_user->userdata;
 
             if ( empty( $ud ) ) {
-                if ( !$ud = bp_core_get_core_userdata($uid) )
+                if ( !$ud = bp_core_get_core_userdata( $user_id ) )
                     return false;
-
-                $user_nicename = $ud->user_nicename;
-                $user_login = $ud->user_login;
             }
+
+            $user_nicename = $ud->user_nicename;
+            $user_login = $ud->user_login;
         }
 
@@ -1016 +1017 @@
 
     /* Add this to cache */
-    wp_cache_set( 'bp_user_username_' . $uid, 'bp' );
+    if ( !empty( $username ) )
+        wp_cache_set( 'bp_user_username_' . $user_id, $username, 'bp' );
 
     return apply_filters( 'bp_core_get_username', $username );
@@ -1034 +1036 @@
 function bp_core_get_user_email( $uid ) {
     if ( !$email = wp_cache_get( 'bp_user_email_' . $uid, 'bp' ) ) {
-        $ud = get_userdata($uid);
+        $ud = bp_core_get_core_userdata($uid);
         $email = $ud->user_email;
     }
@@ -1066 +1068 @@
  */
 function bp_core_get_userlink( $user_id, $no_anchor = false, $just_link = false, $deprecated = false, $with_s = false ) {
-
     $display_name = bp_core_get_user_displayname( $user_id );
 
@@ -1110 +1111 @@
 
             if ( empty($fullname) ) {
-                $ud = get_userdata( $user_id );
+                $ud = bp_core_get_core_userdata( $user_id );
 
                 if ( !empty( $ud->display_name ) )
@@ -1120 +1121 @@
             }
         } else {
-            $ud = get_userdata($user_id);
+            $ud = bp_core_get_core_userdata($user_id);
 
             if ( !empty( $ud->display_name ) )
@@ -1128 +1129 @@
         }
 
-        wp_cache_set( 'bp_user_fullname_' . $user_id, $fullname, 'bp' );
+        if ( !empty( $fullname ) )
+            wp_cache_set( 'bp_user_fullname_' . $user_id, $fullname, 'bp' );
     }