Changeset 9372 for trunk/src/bp-activity/bp-activity-classes.php

Timestamp:

01/19/2015 06:14:47 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Revert r9330 in lieu of original patch on #6099.

When querying for various types and scopes of activity stream items, each BuddyPress component having a unique type or scope also has unique keys and filters responsible for handling the custom queries necessary to get the correct entries from the database.

In some instances (like single groups, member favorites, etc...) these scopes are returning invalid (or empty) results, causing no activity entries to be returned from the database when entries do exist and should be displayed.

Unit tests still apply (though they get some variable clean-up here.)

Hat-tip hnla for discovery. Props r-a-y, imath. Fixes #6140. Fixes #6099.

File:

• trunk/src/bp-activity/bp-activity-classes.php (modified) (6 diffs)

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

@@ -319 +319 @@
         }
 
-        $defaults = array(
+        $r = wp_parse_args( $args, array(
             'page'              => 1,          // The current page
             'per_page'          => 25,         // Activity items per page
@@ -337 +337 @@
             'update_meta_cache' => true,
             'count_total'       => false,
-        );
-        $r = wp_parse_args( $args, $defaults );
+        ) );
 
         // Select conditions
@@ -360 +359 @@
             if ( ! empty( $scope_query['sql'] ) ) {
                 $where_conditions['scope_query_sql'] = $scope_query['sql'];
-
-            // No matches, so we should alter the SQL statement to match nothing
-            } else {
-                $where_conditions['scope_no_results'] = '0 = 1';
             }
 
@@ -370 +365 @@
                 $r = self::array_replace_recursive( $r, $scope_query['override'] );
             }
+
         // Advanced filtering
         } elseif ( ! empty( $r['filter_query'] ) ) {
             $filter_query = new BP_Activity_Query( $r['filter_query'] );
-            if ( $sql = $filter_query->get_sql() ) {
+            $sql          = $filter_query->get_sql();
+            if ( ! empty( $sql ) ) {
                 $where_conditions['filter_query_sql'] = $sql;
             }
@@ -403 +400 @@
 
         // Hide Hidden Items?
-        if ( ! $r['show_hidden'] )
+        if ( ! $r['show_hidden'] ) {
             $where_conditions['hidden_sql'] = "a.hide_sitewide = 0";
+        }
 
         // Exclude specified items
@@ -616 +614 @@
 
             if ( !empty( $r['max'] ) ) {
-                if ( (int) $total_activities > (int) $r['max'] )
+                if ( (int) $total_activities > (int) $r['max'] ) {
                     $total_activities = $r['max'];
+                }
             }