Changeset 8224

Timestamp:

03/31/2014 09:27:11 PM (12 years ago)

Author:

boonebgorges

Message:

When prefetching group data for an activity loop, avoid the query when there's nothing to fetch

When there are no uncached_ids, don't attempt to query. There's nothing to get,
and it will result in an invalidly formatted SQL query.

Fixes #5503

Location:

trunk

Files:

• bp-groups/bp-groups-activity.php (modified) (1 diff)
• tests/testcases/groups/cache.php (modified) (1 diff)

trunk/bp-groups/bp-groups-activity.php

@@ -144 +144 @@
                 }
 
-                global $wpdb, $bp;
-                $uncached_ids_sql = implode( ',', wp_parse_id_list( $uncached_ids ) );
-                $groups = $wpdb->get_results( "SELECT * FROM {$bp->groups->table_name} WHERE id IN ({$uncached_ids_sql})" );
-                foreach ( $groups as $group ) {
-                        wp_cache_set( $group->id, $group, 'bp_groups' );
+                if ( ! empty( $uncached_ids ) ) {
+                        global $wpdb, $bp;
+                        $uncached_ids_sql = implode( ',', wp_parse_id_list( $uncached_ids ) );
+                        $groups = $wpdb->get_results( "SELECT * FROM {$bp->groups->table_name} WHERE id IN ({$uncached_ids_sql})" );
+                        foreach ( $groups as $group ) {
+                                wp_cache_set( $group->id, $group, 'bp_groups' );
+                        }
                 }
         }

trunk/tests/testcases/groups/cache.php

@@ -102 +102 @@
         }
 
+        /**
+         * @group bp_groups_prefetch_activity_object_data
+         */
+        public function test_bp_groups_prefetch_activity_object_data_all_cached() {
+                $g = $this->factory->group->create();
+
+                // Prime cache
+                groups_get_group( array( 'group_id' => $g ) );
+
+                // fake an activity
+                $a = new stdClass;
+                $a->component = buddypress()->groups->id;
+                $a->item_id = $g;
+                $activities = array(
+                        $a,
+                );
+
+                bp_groups_prefetch_activity_object_data( $activities );
+
+                // This assertion is not really necessary - just checks to see
+                // whether a fatal error has occurred above
+                $this->assertNotEmpty( wp_cache_get( $g, 'bp_groups' ) );
+        }
+
+        /**
+         * @group bp_groups_prefetch_activity_object_data
+         */
+        public function test_bp_groups_prefetch_activity_object_data_some_cached() {
+                $g1 = $this->factory->group->create();
+                $g2 = $this->factory->group->create();
+
+                // Prime cache
+                groups_get_group( array( 'group_id' => $g1 ) );
+
+                // fake activities
+                $a1 = new stdClass;
+                $a1->component = buddypress()->groups->id;
+                $a1->item_id = $g1;
+
+                $a2 = new stdClass;
+                $a2->component = buddypress()->groups->id;
+                $a2->item_id = $g2;
+
+                $activities = array(
+                        $a1,
+                        $a2,
+                );
+
+                bp_groups_prefetch_activity_object_data( $activities );
+
+                $this->assertNotEmpty( wp_cache_get( $g1, 'bp_groups' ) );
+                $this->assertNotEmpty( wp_cache_get( $g2, 'bp_groups' ) );
+        }
 }