Changeset 12152

Timestamp:

05/31/2018 05:21:25 PM (5 years ago)

Author:

r-a-y

Message:

Activity: After r11101, fix notices when using the legacy activity query.

r11101 introduced incremented cache improvements when fetching activity
items. However, if the legacy activity query is force-enabled and if the
'count_total' parameter is passed, a few notices are thrown due to
the $cache_group variable not being defined.

This commit addresses this by declaring the $cache_group variable during
the legacy activity query block.

See #7245.

Fixes #7848 (3.x branch).

File:

• branches/3.0/src/bp-activity/classes/class-bp-activity-activity.php (modified) (2 diffs)

branches/3.0/src/bp-activity/classes/class-bp-activity-activity.php

@@ -614 +614 @@
 
             if ( ! empty( $page ) && ! empty( $per_page ) ) {
-                $pag_sql    = $wpdb->prepare( "LIMIT %d, %d", absint( ( $page - 1 ) * $per_page ), $per_page );
+                $pag_sql = $wpdb->prepare( "LIMIT %d, %d", absint( ( $page - 1 ) * $per_page ), $per_page );
 
                 /** This filter is documented in bp-activity/bp-activity-classes.php */
-                $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}, a.id {$sort} {$pag_sql}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
+                $activity_sql = apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}, a.id {$sort} {$pag_sql}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql );
             } else {
-                $pag_sql    = '';
+                $pag_sql = '';
 
                 /**
@@ -632 +632 @@
                  * @param string $sort       Final sort direction for legacy query.
                  */
-                $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}, a.id {$sort}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) );
-            }
+                $activity_sql = apply_filters( 'bp_activity_get_user_join_filter', "{$select_sql} {$from_sql} {$join_sql} {$where_sql} ORDER BY a.date_recorded {$sort}, a.id {$sort}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql );
+            }
+
+            /*
+             * Queries that include 'last_activity' are cached separately,
+             * since they are generally much less long-lived.
+             */
+            if ( preg_match( '/a\.type NOT IN \([^\)]*\'last_activity\'[^\)]*\)/', $activity_sql ) ) {
+                $cache_group = 'bp_activity';
+            } else {
+                $cache_group = 'bp_activity_with_last_activity';
+            }
+
+            $activities = $wpdb->get_results( $activity_sql );
 
             // Integer casting for legacy activity query.