Changeset 5301 for trunk/bp-themes/bp-default/_inc/ajax.php

Timestamp:

11/08/2011 01:14:31 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Use bp_displayed_user_id() rather than reference the $bp->displayed_user->id global var directly. First step at consolidating user ID checks to use WP_User class later. See #3738.

File:

• trunk/bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -40 +40 @@
     if ( !empty( $_BP_COOKIE['bp-' . $object . '-scope'] ) ) {
         if ( 'personal' == $_BP_COOKIE['bp-' . $object . '-scope'] ) {
-            $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;
             $qs[] = 'user_id=' . $user_id;
         }
-        if ( 'all' != $_BP_COOKIE['bp-' . $object . '-scope'] && empty( $bp->displayed_user->id ) && !$bp->is_single_item )
+        if ( 'all' != $_BP_COOKIE['bp-' . $object . '-scope'] && !bp_displayed_user_id() && !$bp->is_single_item )
             $qs[] = 'scope=' . $_BP_COOKIE['bp-' . $object . '-scope']; // Activity stream scope only on activity directory.
     }