Changeset 5705 for trunk/bp-activity/bp-activity-template.php

Timestamp:

02/11/2012 03:21:00 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Replace direct references to $bp user fullname and user_login with their functional equivalents, and kill off some $bp global usage in the process. See #3994, #3989.

File:

• trunk/bp-activity/bp-activity-template.php (modified) (6 diffs)

trunk/bp-activity/bp-activity-template.php

@@ -142 +142 @@
         }
 
-        $this->full_name = $bp->displayed_user->fullname;
+        $this->full_name = bp_get_displayed_user_fullname();
 
         // Fetch parent content for activity comments so we do not have to query in the loop
@@ -324 +324 @@
         // determine which user_id applies
         if ( empty( $user_id ) )
-            $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
+            $user_id = bp_displayed_user_id() ? bp_displayed_user_id() : bp_loggedin_user_id();
 
         // are we displaying user specific activity?
@@ -360 +360 @@
                     break;
                 case 'mentions':
-                    $user_nicename    = ( bp_displayed_user_id() ) ? $bp->displayed_user->userdata->user_nicename : $bp->loggedin_user->userdata->user_nicename;
-                    $user_login       = ( bp_displayed_user_id() ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
-                    $search_terms     = '@' . bp_core_get_username( $user_id, $user_nicename, $user_login ) . '<'; // Start search at @ symbol and stop search at closing tag delimiter.
+
+                    // Start search at @ symbol and stop search at closing tag delimiter.
+                    $search_terms     = '@' . bp_core_get_username( $user_id ) . '<';
                     $display_comments = 'stream';
                     $user_id = 0;
@@ -371 +371 @@
 
     // Do not exceed the maximum per page
-    if ( !empty( $max ) && ( (int)$per_page > (int)$max ) )
+    if ( !empty( $max ) && ( (int) $per_page > (int) $max ) )
         $per_page = $max;
 
@@ -385 +385 @@
 
     // If specific activity items have been requested, override the $hide_spam argument. This prevents backpat errors with AJAX.
-    if ( !empty( $include ) && 'ham_only' == $spam )
+    if ( !empty( $include ) && ( 'ham_only' == $spam ) )
         $spam = 'all';
 
@@ -2290 +2290 @@
             return false;
 
-        return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( bp_loggedin_user_domain() . bp_get_activity_slug() . '/?r=' . bp_core_get_username( bp_displayed_user_id(), $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) );
+        return apply_filters( 'bp_get_send_public_message_link', wp_nonce_url( bp_loggedin_user_domain() . bp_get_activity_slug() . '/?r=' . bp_core_get_username( bp_displayed_user_id(), bp_get_displayed_user_username(), $bp->displayed_user->userdata->user_login ) ) );
     }