Changeset 9256 for trunk/src/bp-activity/bp-activity-functions.php

Timestamp:

12/22/2014 09:38:24 PM (12 years ago)

Author:

r-a-y

Message:

Activity: Introduce new class - BP_Activity_Query.

BP_Activity_Query is a helper class, which extends the
BP_Recursive_Query class, for generating complex queries against data in
the activity database table.

A 'filter_query' argument has been introduced to the bp_has_activities()
stack to support the use of BP_Activity_Query across the majority of
activity fetching functions.

See #4988.

File:

• trunk/src/bp-activity/bp-activity-functions.php (modified) (4 diffs)

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

@@ -1417 +1417 @@
                 'meta_query'        => false,        // Filter by activity meta. See WP_Meta_Query for format
                 'date_query'        => false,        // Filter by date. See first parameter of WP_Date_Query for format
+                'filter_query'      => false,
                 'show_hidden'       => false,        // Show activity items that are hidden site-wide?
                 'exclude'           => false,        // Comma-separated list of activity IDs to exclude
@@ -1438 +1439 @@
 
         // Attempt to return a cached copy of the first page of sitewide activity.
-        if ( ( 1 === (int) $r['page'] ) && empty( $r['max'] ) && empty( $r['search_terms'] ) && empty( $r['meta_query'] ) && empty( $r['date_query'] ) && empty( $r['filter'] ) && empty( $r['exclude'] ) && empty( $r['in'] ) && ( 'DESC' === $r['sort'] ) && empty( $r['exclude'] ) && ( 'ham_only' === $r['spam'] ) ) {
+        if ( ( 1 === (int) $r['page'] ) && empty( $r['max'] ) && empty( $r['search_terms'] ) && empty( $r['meta_query'] ) && empty( $r['date_query'] ) && empty( $r['filter_query'] ) && empty( $r['filter'] ) && empty( $r['exclude'] ) && empty( $r['in'] ) && ( 'DESC' === $r['sort'] ) && empty( $r['exclude'] ) && ( 'ham_only' === $r['spam'] ) ) {
 
                 $activity = wp_cache_get( 'bp_activity_sitewide_front', 'bp' );
@@ -1451 +1452 @@
                                 'meta_query'        => $r['meta_query'],
                                 'date_query'        => $r['date_query'],
+                                'filter_query'      => $r['filter_query'],
                                 'filter'            => $r['filter'],
                                 'display_comments'  => $r['display_comments'],
@@ -1471 +1473 @@
                         'meta_query'       => $r['meta_query'],
                         'date_query'       => $r['date_query'],
+                        'filter_query'     => $r['filter_query'],
                         'filter'           => $r['filter'],
                         'display_comments' => $r['display_comments'],