<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[49538] trunk: Networks and Sites: Assign the array of site or network data returned from filters to the respective class property:</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/49538">49538</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/49538","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-11-08 11:45:36 +0000 (Sun, 08 Nov 2020)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Networks and Sites: Assign the array of site or network data returned from filters to the respective class property:

* The array of network data returned from the `networks_pre_query` filter is assigned to the `networks` property of the current `WP_Network_Query` instance.
* The array of site data returned from the `sites_pre_query` filter is assigned to the `sites` property of the current `WP_Site_Query` instance.

This avoids the performance overhead of calling `WP_Network_Query::get_networks()` or `WP_Site_Query::get_sites()` twice: first when creating the object instance, then to retrieve the filtered results.

This also makes the filters a bit more consistent with other similar filters, e.g. `posts_pre_query`, `terms_pre_query`, `comments_pre_query`, or `users_pre_query`.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/46086">[46086]</a>, <a href="https://core.trac.wordpress.org/changeset/48990">[48990]</a>.

Props yakimun, spacedmonkey.
Fixes <a href="https://core.trac.wordpress.org/ticket/51333">#51333</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpnetworkqueryphp">trunk/src/wp-includes/class-wp-network-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpsitequeryphp">trunk/src/wp-includes/class-wp-site-query.php</a></li>
<li><a href="#trunktestsphpunittestscommentqueryphp">trunk/tests/phpunit/tests/comment/query.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitenetworkQueryphp">trunk/tests/phpunit/tests/multisite/networkQuery.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesiteQueryphp">trunk/tests/phpunit/tests/multisite/siteQuery.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpnetworkqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-network-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-network-query.php  2020-11-08 09:50:07 UTC (rev 49537)
+++ trunk/src/wp-includes/class-wp-network-query.php    2020-11-08 11:45:36 UTC (rev 49538)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +212,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 *   an array of network IDs.
</span><span class="cx" style="display: block; padding: 0 10px">                 * - Otherwise the filter should return an array of WP_Network objects.
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * Note that if the filter returns an array of network data, it will be assigned
+                * to the `networks` property of the current WP_Network_Query instance.
+                *
+                * Filtering functions that require pagination information are encouraged to set
+                * the `found_networks` and `max_num_pages` properties of the WP_Network_Query object,
+                * passed to the filter by reference. If WP_Network_Query does not perform a database
+                * query, it will not have enough information to generate these values itself.
+                *
</ins><span class="cx" style="display: block; padding: 0 10px">                  * @since 5.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 5.6.0 The returned array of network data is assigned to the `networks` property
+                *              of the current WP_Network_Query instance.
</ins><span class="cx" style="display: block; padding: 0 10px">                  *
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param array|int|null   $network_data Return an array of network data to short-circuit WP's network query,
</span><span class="cx" style="display: block; padding: 0 10px">                 *                                       the network count as an integer if `$this->query_vars['count']` is set,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,6 +232,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $network_data = apply_filters_ref_array( 'networks_pre_query', array( $network_data, &$this ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( null !== $network_data ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        if ( is_array( $network_data ) && ! $this->query_vars['count'] ) {
+                               $this->networks = $network_data;
+                       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         return $network_data;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpsitequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-site-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-site-query.php     2020-11-08 09:50:07 UTC (rev 49537)
+++ trunk/src/wp-includes/class-wp-site-query.php       2020-11-08 11:45:36 UTC (rev 49538)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,7 +303,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 *   an array of site IDs.
</span><span class="cx" style="display: block; padding: 0 10px">                 * - Otherwise the filter should return an array of WP_Site objects.
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * Note that if the filter returns an array of site data, it will be assigned
+                * to the `sites` property of the current WP_Site_Query instance.
+                *
+                * Filtering functions that require pagination information are encouraged to set
+                * the `found_sites` and `max_num_pages` properties of the WP_Site_Query object,
+                * passed to the filter by reference. If WP_Site_Query does not perform a database
+                * query, it will not have enough information to generate these values itself.
+                *
</ins><span class="cx" style="display: block; padding: 0 10px">                  * @since 5.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 * @since 5.6.0 The returned array of site data is assigned to the `sites` property
+                *              of the current WP_Site_Query instance.
</ins><span class="cx" style="display: block; padding: 0 10px">                  *
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param array|int|null $site_data Return an array of site data to short-circuit WP's site query,
</span><span class="cx" style="display: block; padding: 0 10px">                 *                                  the site count as an integer if `$this->query_vars['count']` is set,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,6 +323,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $site_data = apply_filters_ref_array( 'sites_pre_query', array( $site_data, &$this ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( null !== $site_data ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        if ( is_array( $site_data ) && ! $this->query_vars['count'] ) {
+                               $this->sites = $site_data;
+                       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                         return $site_data;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunktestsphpunittestscommentqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/query.php       2020-11-08 09:50:07 UTC (rev 49537)
+++ trunk/tests/phpunit/tests/comment/query.php 2020-11-08 11:45:36 UTC (rev 49538)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4926,7 +4926,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $q       = new WP_Comment_Query();
</span><span class="cx" style="display: block; padding: 0 10px">                $results = $q->query( array() );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                remove_filter( 'comments_pre_query', array( __CLASS__, 'filter_comments_pre_query_and_set_comments' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         remove_filter( 'comments_pre_query', array( __CLASS__, 'filter_comments_pre_query_and_set_comments' ), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Make sure the comments property is the same as the results.
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame( $results, $q->comments );
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitenetworkQueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/networkQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/networkQuery.php      2020-11-08 09:50:07 UTC (rev 49537)
+++ trunk/tests/phpunit/tests/multisite/networkQuery.php        2020-11-08 11:45:36 UTC (rev 49538)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,6 +554,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        return array( 555 );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               /**
+                * @ticket 51333
+                */
+               public function test_networks_pre_query_filter_should_set_networks_property() {
+                       add_filter( 'networks_pre_query', array( __CLASS__, 'filter_networks_pre_query_and_set_networks' ), 10, 2 );
+
+                       $q       = new WP_Network_Query();
+                       $results = $q->query( array() );
+
+                       remove_filter( 'networks_pre_query', array( __CLASS__, 'filter_networks_pre_query_and_set_networks' ), 10 );
+
+                       // Make sure the networks property is the same as the results.
+                       $this->assertSame( $results, $q->networks );
+
+                       // Make sure the network domain is `wordpress.org`.
+                       $this->assertSame( 'wordpress.org', $q->networks[0]->domain );
+               }
+
+               public static function filter_networks_pre_query_and_set_networks( $networks, $query ) {
+                       return array( get_network( self::$network_ids['wordpress.org/'] ) );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesiteQueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/siteQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/siteQuery.php 2020-11-08 09:50:07 UTC (rev 49537)
+++ trunk/tests/phpunit/tests/multisite/siteQuery.php   2020-11-08 11:45:36 UTC (rev 49538)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1095,6 +1095,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        return array( 555 );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               /**
+                * @ticket 51333
+                */
+               public function test_sites_pre_query_filter_should_set_sites_property() {
+                       add_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_pre_query_and_set_sites' ), 10, 2 );
+
+                       $q       = new WP_Site_Query();
+                       $results = $q->query( array() );
+
+                       remove_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_pre_query_and_set_sites' ), 10 );
+
+                       // Make sure the sites property is the same as the results.
+                       $this->assertSame( $results, $q->sites );
+
+                       // Make sure the site domain is `wordpress.org`.
+                       $this->assertSame( 'wordpress.org', $q->sites[0]->domain );
+               }
+
+               public static function filter_sites_pre_query_and_set_sites( $sites, $query ) {
+                       return array( get_site( self::$site_ids['wordpress.org/'] ) );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span></span></pre>
</div>
</div>

</body>
</html>