Ticket #6645: 6645.filter-query-independent.patch

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

@@ -352 +352 @@
                 // Excluded types
                 $excluded_types = array();
 
-                // Scope takes precedence
+                // Scope parsing
                 if ( ! empty( $r['scope'] ) ) {
                         $scope_query = self::get_scope_query_sql( $r['scope'], $r );
 
@@ -365 +365 @@
                         if ( ! empty( $scope_query['override'] ) ) {
                                 $r = self::array_replace_recursive( $r, $scope_query['override'] );
                         }
+                }
 
                 // Advanced filtering
-                } elseif ( ! empty( $r['filter_query'] ) ) {
+                if ( ! empty( $r['filter_query'] ) ) {
                         $filter_query = new BP_Activity_Query( $r['filter_query'] );
                         $sql          = $filter_query->get_sql();
                         if ( ! empty( $sql ) ) {