Changeset 2285

Timestamp:

01/10/2010 11:38:25 AM (16 years ago)

Author:

apeatling

Message:

Updating user_domain() fetching and caching and removing any duplication with userurl().

Location:

trunk

Files:

• bp-activity.php (modified) (2 diffs)
• bp-core.php (modified) (3 diffs)
• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-friends.php (modified) (3 diffs)
• bp-friends/bp-friends-templatetags.php (modified) (2 diffs)
• bp-groups.php (modified) (1 diff)

trunk/bp-activity.php

@@ -249 +249 @@
     if ( $activity->component_name == $bp->groups->id ) {
         if ( $activity->user_id )
-            $redirect = bp_core_get_userurl( $activity->user_id ) . $bp->activity->slug . '/' . $activity->id;
+            $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug . '/' . $activity->id;
         else {
             if ( $group = groups_get_group( array( 'group_id' => $activity->item_id ) ) )
@@ -255 +255 @@
         }
     } else
-        $redirect = bp_core_get_userurl( $activity->user_id ) . $bp->activity->slug . '/' . $activity->id;
+        $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug . '/' . $activity->id;
 
     if ( !$redirect )

trunk/bp-core.php

@@ -537 +537 @@
     if ( !$user_id ) return;
 
-    if ( $domain = wp_cache_get( 'bp_user_domain_' . $user_id, 'bp' ) )
-        return apply_filters( 'bp_core_get_user_domain', $domain );
-
-    if ( !$user_nicename && !$user_login ) {
-        $ud = get_userdata($user_id);
-        $user_nicename = $ud->user_nicename;
-        $user_login = $ud->user_login;
-    }
-
-    if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) )
-        $username = $user_login;
-    else
-        $username = $user_nicename;
-
-    /* If we are using a members slug, include it. */
-    if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) )
-        $domain = $bp->root_domain . '/' . BP_MEMBERS_SLUG . '/' . $username . '/';
-    else
-        $domain = $bp->root_domain . '/' . $username . '/';
-
-    /* Cache the link */
-    wp_cache_set( 'bp_user_domain_' . $user_id, $domain, 'bp' );
+    if ( !$domain = wp_cache_get( 'bp_user_domain_' . $user_id, 'bp' ) ) {
+        $username = bp_core_get_username( $user_id, $user_nicename, $user_login );
+
+        /* If we are using a members slug, include it. */
+        if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) )
+            $domain = $bp->root_domain . '/' . BP_MEMBERS_SLUG . '/' . $username . '/';
+        else
+            $domain = $bp->root_domain . '/' . $username . '/';
+
+        /* Cache the link */
+        wp_cache_set( 'bp_user_domain_' . $user_id, $domain, 'bp' );
+    }
 
     return apply_filters( 'bp_core_get_user_domain', $domain );
 }
+/* DEPRECATED */
+function bp_core_get_userurl( $uid ) { return bp_core_get_user_domain( $uid ); }
 
 /**
@@ -992 +984 @@
  * @return str the username of the matched user.
  */
-function bp_core_get_username( $uid ) {
-    global $userdata;
-
-    if ( $uid == $userdata->ID )
-        $username =  __( 'You', 'buddypress' );
-
-    if ( !$ud = get_userdata($uid) )
-        return false;
-
-    $username = $ud->user_login;
+function bp_core_get_username( $uid, $user_nicename = false, $user_login = false ) {
+    global $bp;
+
+    if ( !$username = wp_cache_get( 'bp_user_username_' . $uid, 'bp' ) ) {
+        if ( empty( $user_nicename ) && empty( $user_login ) ) {
+            $ud = false;
+
+            if ( $bp->loggedin_user->id == $uid )
+                $ud = &$bp->loggedin_user->userdata;
+
+            if ( $bp->displayed_user->id == $uid )
+                $ud = &$bp->displayed_user->userdata;
+
+            if ( empty( $ud ) ) {
+                if ( !$ud = bp_core_get_core_userdata($uid) )
+                    return false;
+
+                $user_nicename = $ud->user_nicename;
+                $user_login = $ud->user_login;
+            }
+        }
+
+        if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) )
+            $username = $user_login;
+        else
+            $username = $user_nicename;
+    }
+
+    /* Add this to cache */
+    wp_cache_set( 'bp_user_username_' . $uid, 'bp' );
 
     return apply_filters( 'bp_core_get_username', $username );
-}
-
-/**
- * bp_core_get_userurl()
- *
- * Returns the URL with no HTML markup for a user based on their user id.
- *
- * @package BuddyPress Core
- * @param $uid int 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
- * @return false on no match
- * @return str The URL for the user with no HTML formatting.
- */
-function bp_core_get_userurl( $uid ) {
-    global $bp;
-
-    if ( !$url = wp_cache_get( 'bp_user_url_' . $uid, 'bp' ) ) {
-        $url = bp_core_get_user_domain( $uid );
-    }
-
-    return apply_filters( 'bp_core_get_userurl', $url );
 }
 
@@ -1082 +1072 @@
         return $display_name;
 
-    if ( !$url = bp_core_get_userurl($user_id) )
+    if ( !$url = bp_core_get_user_domain($user_id) )
         return false;
 

trunk/bp-core/bp-core-classes.php

@@ -65 +65 @@
             $this->email = attribute_escape( $this->profile_data['user_email'] );
         } else {
-            $this->user_url = bp_core_get_userurl( $this->id );
+            $this->user_url = bp_core_get_user_domain( $this->id );
             $this->user_link = bp_core_get_userlink( $this->id );
             $this->fullname = attribute_escape( bp_core_get_user_displayname( $this->id ) );

trunk/bp-core/bp-core-templatetags.php

@@ -1311 +1311 @@
     }
 
+function bp_displayed_user_username() {
+    echo bp_get_displayed_user_username();
+}
+    function bp_get_displayed_user_username() {
+        global $bp;
+        return apply_filters( 'bp_get_displayed_user_username', bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) );
+    }
+
+function bp_loggedin_user_username() {
+    echo bp_get_loggedin_user_username();
+}
+    function bp_get_loggedin_user_username() {
+        global $bp;
+        return apply_filters( 'bp_get_loggedin_user_username', bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login ) );
+    }
+
 function bp_current_component() {
     global $bp;

trunk/bp-friends.php

@@ -313 +313 @@
             } else {
                 $user_fullname = bp_core_get_user_displayname( $item_id );
-                $user_url = bp_core_get_userurl( $item_id );
+                $user_url = bp_core_get_domain( $item_id );
                 return apply_filters( 'bp_friends_single_friendship_accepted_notification', '<a href="' . $user_url . '?new" title="' . $user_fullname .'\'s profile">' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
             }
@@ -323 +323 @@
             } else {
                 $user_fullname = bp_core_get_user_displayname( $item_id );
-                $user_url = bp_core_get_userurl( $item_id );
+                $user_url = bp_core_get_user_domain( $item_id );
                 return apply_filters( 'bp_friends_single_friendship_request_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/requests" title="' . __( 'Friendship requests', 'buddypress' ) . '">' . sprintf( __('You have a friendship request from %s', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
             }
@@ -419 +419 @@
         $friend_link = bp_core_get_userlink( $friendship->friend_user_id );
 
-        $primary_link = apply_filters( 'friends_activity_friendship_accepted_primary_link', bp_core_get_userurl( $friendship->initiator_user_id ), &$friendship );
+        $primary_link = apply_filters( 'friends_activity_friendship_accepted_primary_link', bp_core_get_user_domain( $friendship->initiator_user_id ), &$friendship );
 
         /* Record in activity streams for the initiator */

trunk/bp-friends/bp-friends-templatetags.php

@@ -44 +44 @@
             <?php for ( $i = 0; $i < count( $friend_ids ); $i++ ) { ?>
                 <li>
-                    <a href="<?php echo bp_core_get_userurl( $friend_ids[$i] ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $friend_ids[$i], 'type' => 'thumb' ) ) ?></a>
+                    <a href="<?php echo bp_core_get_domain( $friend_ids[$i] ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $friend_ids[$i], 'type' => 'thumb' ) ) ?></a>
                     <h5><?php echo bp_core_get_userlink($friend_ids[$i]) ?></h5>
                 </li>
@@ -71 +71 @@
         <?php for ( $i = 0; $i < count( $user_ids['users'] ); $i++ ) { ?>
             <li>
-                <a href="<?php echo bp_core_get_userurl( $user_ids['users'][$i]->user_id ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $user_ids['users'][$i]->user_id, 'type' => 'thumb' ) ) ?></a>
+                <a href="<?php echo bp_core_get_user_domain( $user_ids['users'][$i]->user_id ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $user_ids['users'][$i]->user_id, 'type' => 'thumb' ) ) ?></a>
                 <h5><?php echo bp_core_get_userlink($user_ids['users'][$i]->user_id) ?></h5>
                 <?php if ( function_exists( 'xprofile_get_random_profile_data' ) ) { ?>

trunk/bp-groups.php

@@ -1511 +1511 @@
 
             $group = new BP_Groups_Group( $group_id, false, false );
-            $user_url = bp_core_get_userurl( $user_id );
+            $user_url = bp_core_get_domain( $user_id );
 
             if ( (int)$total_items > 1 ) {