Changeset 9471 for trunk/src/bp-members/bp-members-template.php

Timestamp:

02/10/2015 02:49:16 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Replace all remaining $bp global touches with buddypress().

All existing tests continue to pass as normal. I will further manually scrutinize each replacement to ensure correctness.

Fixes #5138. Any stragglers or updates will reference this ticket.

File:

• trunk/src/bp-members/bp-members-template.php (modified) (12 diffs)

trunk/src/bp-members/bp-members-template.php

@@ -1298 +1298 @@
  */
 function bp_get_loggedin_user_nav() {
-    global $bp;
+    $bp = buddypress();
 
     // Loop through each navigation item
@@ -1340 +1340 @@
  */
 function bp_get_displayed_user_nav() {
-    global $bp;
+    $bp = buddypress();
 
     foreach ( (array) $bp->bp_nav as $user_nav_item ) {
@@ -1484 +1484 @@
      */
     function bp_get_displayed_user_email() {
-        global $bp;
+        $bp = buddypress();
 
         // If displayed user exists, return email address
@@ -1646 +1646 @@
  */
 function bp_displayed_user_domain() {
-    global $bp;
+    $bp = buddypress();
 
     /**
@@ -1664 +1664 @@
  */
 function bp_loggedin_user_domain() {
-    global $bp;
+    $bp = buddypress();
 
     /**
@@ -1688 +1688 @@
      */
     function bp_get_displayed_user_fullname() {
-        global $bp;
+        $bp = buddypress();
 
         /**
@@ -1718 +1718 @@
      */
     function bp_get_loggedin_user_fullname() {
-        global $bp;
+        $bp = buddypress();
 
         /**
@@ -1742 +1742 @@
      */
     function bp_get_displayed_user_username() {
-        global $bp;
+        $bp = buddypress();
 
         if ( bp_displayed_user_id() ) {
@@ -1772 +1772 @@
      */
     function bp_get_loggedin_user_username() {
-        global $bp;
+        $bp = buddypress();
 
         if ( bp_loggedin_user_id() ) {
@@ -2096 +2096 @@
      */
     function bp_get_signup_avatar_dir_value() {
-        global $bp;
+        $bp = buddypress();
 
         // Check if signup_avatar_dir is passed
@@ -2132 +2132 @@
      */
     function bp_get_current_signup_step() {
-        global $bp;
-
-        return $bp->signup->step;
+        return buddypress()->signup->step;
     }
 
@@ -2303 +2301 @@
      */
     function bp_get_members_component_link( $component, $action = '', $query_args = '', $nonce = false ) {
-        global $bp;
 
         // Must be displayed user
         if ( !bp_displayed_user_id() )
             return;
+
+        $bp = buddypress();
 
         // Append $action to $url if there is no $type