Changeset 9406 for trunk/src/bp-friends/bp-friends-activity.php

Timestamp:

01/28/2015 10:50:33 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Move $user_id abstraction out of bp_get_activities() and into their respective scope filters.

This fixes a regression from Activity Query scope improvements causing private and hidden group activity queries to intersect with user ID's, resulting in unexpected activity stream items being displayed.

Tests included in r9405.

Props r-a-y. Fixes #6169.

File:

• trunk/src/bp-friends/bp-friends-activity.php (modified) (7 diffs)

trunk/src/bp-friends/bp-friends-activity.php

@@ -239 +239 @@
  * @return array
  */
-function bp_friends_filter_activity_scope( $retval, $filter ) {
-    $friends = friends_get_friend_user_ids( $filter['user_id'] );
-
+function bp_friends_filter_activity_scope( $retval = array(), $filter = array() ) {
+
+    // Determine the user_id
+    if ( ! empty( $filter['user_id'] ) ) {
+        $user_id = $filter['user_id'];
+    } else {
+        $user_id = bp_displayed_user_id()
+            ? bp_displayed_user_id()
+            : bp_loggedin_user_id();
+    }
+
+    // Determine friends of user
+    $friends = friends_get_friend_user_ids( $user_id );
     if ( empty( $friends ) ) {
         $friends = array( 0 );
     }
 
-    $retval= array(
+    $retval = array(
         'relation' => 'AND',
         array(
@@ -253 +263 @@
             'value'   => (array) $friends
         ),
+
         // we should only be able to view sitewide activity content for friends
         array(
@@ -258 +269 @@
             'value'  => 0
         ),
+
+        // overrides
+        'override' => array(
+            'filter'      => array( 'user_id' => 0 ),
+            'show_hidden' => true
+        ),
     );
-
-    // wipe out the user ID
-    $retval['override']['filter']['user_id'] = 0;
-
-    // make sure we aren't limiting items by 'hide_sitewide' since we're already
-    // limiting it above
-    $retval['override']['show_hidden'] = true;
 
     return $retval;
@@ -282 +292 @@
  * @return array
  */
-function bp_friends_filter_activity_just_me_scope( $retval, $filter ) {
+function bp_friends_filter_activity_just_me_scope( $retval = array(), $filter = array() ) {
+
+    // Determine the user_id
+    if ( ! empty( $filter['user_id'] ) ) {
+        $user_id = $filter['user_id'];
+    } else {
+        $user_id = bp_displayed_user_id()
+            ? bp_displayed_user_id()
+            : bp_loggedin_user_id();
+    }
+
     // Get the requested action
     $action = $filter['filter']['action'];
@@ -294 +314 @@
 
     /**
-     * If filtering activities for something other than the friendship_created action
-     * return without changing anything
+     * If filtering activities for something other than the friendship_created
+     * action return without changing anything
      */
     if ( ! empty( $action ) && ! isset( $action['friendship_created'] ) ) {
         return $retval;
+    }
+
+    // Juggle existing override value
+    $override = array();
+    if ( ! empty( $retval['override'] ) ) {
+        $override = $retval['override'];
+        unset( $retval['override'] );
     }
 
@@ -306 +333 @@
      * - user has been requested a friendship
      */
-    return array(
+    $retval = array(
         'relation' => 'OR',
-        array(
-            'column' => 'user_id',
-            'value'  => $filter['user_id']
-        ),
+        $retval,
         array(
             'relation' => 'AND',
@@ -320 +344 @@
             array(
                 'column' => 'secondary_item_id',
-                'value'  => $filter['user_id'],
+                'value'  => $user_id,
             ),
-        ),
-        'override' => array(
-            'display_comments' => 'stream',
-            'filter'           => array( 'user_id' => 0 ),
-        ),
+        )
     );
+
+    // Juggle back override value
+    if ( ! empty( $override ) ) {
+        $retval['override'] = $override;
+    }
+
+    return $retval;
 }
 add_filter( 'bp_activity_set_just-me_scope_args', 'bp_friends_filter_activity_just_me_scope', 20, 2 );