Changeset 5704 for trunk/bp-settings/bp-settings-loader.php

Timestamp:

02/11/2012 02:45:59 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Replace direct references to $bp user domains with their functional equivalents. See #3994.

File:

• trunk/bp-settings/bp-settings-loader.php (modified) (2 diffs)

trunk/bp-settings/bp-settings-loader.php

@@ -89 +89 @@
 
         // Determine user to use
-        if ( isset( $bp->displayed_user->domain ) )
-            $user_domain = $bp->displayed_user->domain;
-        elseif ( isset( $bp->loggedin_user->domain ) )
-            $user_domain = $bp->loggedin_user->domain;
+        if ( bp_displayed_user_domain() )
+            $user_domain = bp_displayed_user_domain();
+        elseif ( bp_loggedin_user_domain() )
+            $user_domain = bp_loggedin_user_domain();
         else
             return;
@@ -151 +151 @@
 
             // Setup the logged in user variables
-            $user_domain   = $bp->loggedin_user->domain;
+            $user_domain   = bp_loggedin_user_domain();
             $settings_link = trailingslashit( $user_domain . $this->slug );