Changeset 5705 for trunk/bp-forums/bp-forums-loader.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-forums/bp-forums-loader.php (modified) (4 diffs)

trunk/bp-forums/bp-forums-loader.php

@@ -1 +1 @@
 <?php
+
 /**
  * BuddyPress Forums Loader
@@ -119 +120 @@
         if ( bp_displayed_user_domain() ) {
             $user_domain = bp_displayed_user_domain();
-            $user_login  = $bp->displayed_user->userdata->user_login;
         } elseif ( bp_loggedin_user_domain() ) {
             $user_domain = bp_loggedin_user_domain();
-            $user_login  = $bp->loggedin_user->userdata->user_login;
         } else {
             return;
@@ -183 +182 @@
 
             // Setup the logged in user variables
-            $user_domain = bp_loggedin_user_domain();
-            $user_login  = $bp->loggedin_user->userdata->user_login;
-            $forums_link = trailingslashit( $user_domain . $this->slug );
+            $forums_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
 
             // Add the "My Account" sub menus
@@ -241 +238 @@
                     'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
                 ) );
-                $bp->bp_options_title  = $bp->displayed_user->fullname;
+                $bp->bp_options_title  = bp_get_displayed_user_fullname();
             }
         }