Changeset 46100 for trunk/tests/phpunit/tests/multisite/siteQuery.php

Timestamp:

09/12/2019 10:16:08 PM (2 years ago)

Author:

adamsilverstein

Message:

Multisite: improve sites_pre_query and networks_pre_query filters, avoiding db queries.

Improve the pre_query filters in multisite classes introduced in r44983. Return (non null) values immediately,
avoiding the database queries entirely, similar to other pre_query filters.

Props spacedmonkey, SergeyBiryukov, felipeelia.
Fixes #47599.

File:

• trunk/tests/phpunit/tests/multisite/siteQuery.php (modified) (3 diffs)

trunk/tests/phpunit/tests/multisite/siteQuery.php

@@ -915 +915 @@
         /**
          * @ticket 45749
+         * @ticket 47599
          */
         public function test_sites_pre_query_filter_should_bypass_database_query() {
@@ -924 +925 @@
 
             $q       = new WP_Site_Query();
-            $results = $q->query(
-                array(
-                    'fields' => 'ids',
-                )
-            );
+            $results = $q->query( array() );
 
             remove_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_pre_query' ), 10, 2 );
@@ -936 +933 @@
 
             // We manually inserted a non-existing site and overrode the results with it.
-            $this->assertSame( array( 555 ), $q->sites );
+            $this->assertSame( array( 555 ), $results );
 
             // Make sure manually setting total_users doesn't get overwritten.