Changeset 13396

Timestamp:

01/07/2023 12:42:51 AM (11 months ago)

Author:

espellcaste

Message:

Activity: adding test to confirm BP_Activity_Activity::get returns the proper data when using the meta_query argument.

See #8556

Location:

trunk

Files:

• src/bp-activity/classes/class-bp-activity-activity.php (modified) (3 diffs)
• tests/phpunit/testcases/activity/class.BP_Activity_Activity.php (modified) (1 diff)

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

@@ -1050 +1050 @@
      * @since 1.8.0
      *
+     * @global wpdb $wpdb WordPress database object.
+     *
      * @param array $meta_query An array of meta_query filters. See the
      *                          documentation for WP_Meta_Query for details.
@@ -1057 +1059 @@
         global $wpdb;
 
+        // Default array keys & empty values.
         $sql_array = array(
             'join'  => '',
@@ -1062 +1065 @@
         );
 
-        if ( ! empty( $meta_query ) ) {
-            $activity_meta_query = new WP_Meta_Query( $meta_query );
-
-            // WP_Meta_Query expects the table name at
-            // $wpdb->activitymeta.
-            $wpdb->activitymeta = buddypress()->activity->table_name_meta;
-
-            $meta_sql = $activity_meta_query->get_sql( 'activity', 'a', 'id' );
-
-            // Strip the leading AND - BP handles it in get().
-            $sql_array['where'] = preg_replace( '/^\sAND/', '', $meta_sql['where'] );
-            $sql_array['join']  = $meta_sql['join'];
-        }
+        // Bail if no meta query.
+        if ( empty( $meta_query ) ) {
+            return $sql_array;
+        }
+
+        $bp                  = buddypress();
+        $activity_meta_query = new WP_Meta_Query( $meta_query );
+
+        // WP_Meta_Query expects the table name at $wpdb->activitymeta.
+        $wpdb->activitymeta = $bp->activity->table_name_meta;
+
+        $meta_sql = $activity_meta_query->get_sql( 'activity', 'a', 'id' );
+
+        // Strip the leading AND - BP handles it in get().
+        $sql_array['where'] = preg_replace( '/^\sAND/', '', $meta_sql['where'] );
+        $sql_array['join']  = $meta_sql['join'];
 
         return $sql_array;

trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php

@@ -95 +95 @@
         $a1 = self::factory()->activity->create();
         $a2 = self::factory()->activity->create();
+
         bp_activity_update_meta( $a1, 'foo', 'bar' );
 
-        $activity = BP_Activity_Activity::get( array(
-            'meta_query' => array(
-                array(
-                    'key' => 'foo',
-                    'value' => 'bar',
-                ),
-            ),
-        ) );
-        $ids = wp_list_pluck( $activity['activities'], 'id' );
-        $this->assertEquals( $ids, array( $a1 ) );
+        $activity = BP_Activity_Activity::get(
+            [
+                'meta_query' => [
+                    [
+                        'key'     => 'foo',
+                        'compare' => 'EXISTS',
+                    ],
+                ],
+            ]
+        );
+
+        $this->assertEquals( [ $a1 ], wp_list_pluck( $activity['activities'], 'id' ) );
+
+        $activity = BP_Activity_Activity::get(
+            [
+                'meta_query' => [
+                    [
+                        'key'     => 'foo',
+                        'compare' => 'NOT EXISTS',
+                    ],
+                ],
+            ]
+        );
+
+        $this->assertEquals( [ $a2 ], wp_list_pluck( $activity['activities'], 'id' ) );
     }