<!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>[44928] branches/5.1/src/wp-includes: Multisite: Do not prime site meta caches unless necessary.</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/44928">44928</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/44928","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-03-18 16:20:53 +0000 (Mon, 18 Mar 2019)</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'>Multisite: Do not prime site meta caches unless necessary.
Merges <a href="https://core.trac.wordpress.org/changeset/44926">[44926]</a> to the 5.1 branch.
Props spacedmonkey.
Fixes <a href="https://core.trac.wordpress.org/ticket/46357">#46357</a>. See <a href="https://core.trac.wordpress.org/ticket/46167">#46167</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches51srcwpadminnetworkupgradephp">branches/5.1/src/wp-admin/network/upgrade.php</a></li>
<li><a href="#branches51srcwpincludesembedphp">branches/5.1/src/wp-includes/embed.php</a></li>
<li><a href="#branches51srcwpincludesmsblogsphp">branches/5.1/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#branches51srcwpincludesmsfunctionsphp">branches/5.1/src/wp-includes/ms-functions.php</a></li>
<li><a href="#branches51srcwpincludesmsloadphp">branches/5.1/src/wp-includes/ms-load.php</a></li>
<li><a href="#branches51srcwpincludesuserphp">branches/5.1/src/wp-includes/user.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches51">branches/5.1/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.1
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.1 2019-03-18 16:19:27 UTC (rev 44927)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.1 2019-03-18 16:20:53 UTC (rev 44928)
</ins><a id="branches51"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.1</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:44744,44747-44749,44760,44762,44768-44769,44788,44794,44797,44799,44801,44805-44806,44814,44816,44829,44833,44842,44858,44925
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:44744,44747-44749,44760,44762,44768-44769,44788,44794,44797,44799,44801,44805-44806,44814,44816,44829,44833,44842,44858,44925-44926
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches51srcwpadminnetworkupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-admin/network/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-admin/network/upgrade.php 2019-03-18 16:19:27 UTC (rev 44927)
+++ branches/5.1/src/wp-admin/network/upgrade.php 2019-03-18 16:20:53 UTC (rev 44928)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,15 +57,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_ids = get_sites(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'spam' => 0,
- 'deleted' => 0,
- 'archived' => 0,
- 'network_id' => get_current_network_id(),
- 'number' => 5,
- 'offset' => $n,
- 'fields' => 'ids',
- 'order' => 'DESC',
- 'orderby' => 'id',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'spam' => 0,
+ 'deleted' => 0,
+ 'archived' => 0,
+ 'network_id' => get_current_network_id(),
+ 'number' => 5,
+ 'offset' => $n,
+ 'fields' => 'ids',
+ 'order' => 'DESC',
+ 'orderby' => 'id',
+ 'update_site_meta_cache' => false,
</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"> if ( empty( $site_ids ) ) {
</span></span></pre></div>
<a id="branches51srcwpincludesembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-includes/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-includes/embed.php 2019-03-18 16:19:27 UTC (rev 44927)
+++ branches/5.1/src/wp-includes/embed.php 2019-03-18 16:20:53 UTC (rev 44928)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,8 +586,9 @@
</span><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"> $qv = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'domain' => $url_parts['host'],
- 'path' => '/',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'domain' => $url_parts['host'],
+ 'path' => '/',
+ 'update_site_meta_cache' => false,
</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"> // In case of subdirectory configs, set the path.
</span></span></pre></div>
<a id="branches51srcwpincludesmsblogsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-includes/ms-blogs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-includes/ms-blogs.php 2019-03-18 16:19:27 UTC (rev 44927)
+++ branches/5.1/src/wp-includes/ms-blogs.php 2019-03-18 16:20:53 UTC (rev 44928)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,10 +97,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_ids = get_sites(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'number' => 1,
- 'fields' => 'ids',
- 'domain' => $domain,
- 'path' => $path,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'number' => 1,
+ 'fields' => 'ids',
+ 'domain' => $domain,
+ 'path' => $path,
+ 'update_site_meta_cache' => false,
</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">
</span></span></pre></div>
<a id="branches51srcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-includes/ms-functions.php 2019-03-18 16:19:27 UTC (rev 44927)
+++ branches/5.1/src/wp-includes/ms-functions.php 2019-03-18 16:20:53 UTC (rev 44928)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,10 +345,11 @@
</span><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"> $args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'domain' => $domain,
- 'path' => $path,
- 'fields' => 'ids',
- 'number' => 1,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'domain' => $domain,
+ 'path' => $path,
+ 'fields' => 'ids',
+ 'number' => 1,
+ 'update_site_meta_cache' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = get_sites( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $id = array_shift( $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1473,11 +1474,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function domain_exists( $domain, $path, $network_id = 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $path = trailingslashit( $path );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'network_id' => $network_id,
- 'domain' => $domain,
- 'path' => $path,
- 'fields' => 'ids',
- 'number' => 1,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'network_id' => $network_id,
+ 'domain' => $domain,
+ 'path' => $path,
+ 'fields' => 'ids',
+ 'number' => 1,
+ 'update_site_meta_cache' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = get_sites( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = array_shift( $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2433,11 +2435,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $count = get_sites(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'network_id' => $network_id,
- 'spam' => 0,
- 'deleted' => 0,
- 'archived' => 0,
- 'count' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'network_id' => $network_id,
+ 'spam' => 0,
+ 'deleted' => 0,
+ 'archived' => 0,
+ 'count' => true,
+ 'update_site_meta_cache' => false,
</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">
</span></span></pre></div>
<a id="branches51srcwpincludesmsloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-includes/ms-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-includes/ms-load.php 2019-03-18 16:19:27 UTC (rev 44927)
+++ branches/5.1/src/wp-includes/ms-load.php 2019-03-18 16:20:53 UTC (rev 44928)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +235,8 @@
</span><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"> $args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'number' => 1,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'number' => 1,
+ 'update_site_meta_cache' => false,
</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"> if ( count( $domains ) > 1 ) {
</span></span></pre></div>
<a id="branches51srcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.1/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.1/src/wp-includes/user.php 2019-03-18 16:19:27 UTC (rev 44927)
+++ branches/5.1/src/wp-includes/user.php 2019-03-18 16:20:53 UTC (rev 44928)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -680,8 +680,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $site_ids ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'number' => '',
- 'site__in' => $site_ids,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'number' => '',
+ 'site__in' => $site_ids,
+ 'update_site_meta_cache' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $all ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['archived'] = 0;
</span></span></pre>
</div>
</div>
</body>
</html>