<!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>[51301] trunk/src/wp-includes: Docs: Undo the accidental revert of [51299] made in [51300].</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/51301">51301</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/51301","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-07-01 21:28:38 +0000 (Thu, 01 Jul 2021)</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'>Docs: Undo the accidental revert of <a href="https://core.trac.wordpress.org/changeset/51299">[51299]</a> made in <a href="https://core.trac.wordpress.org/changeset/51300">[51300]</a>.
See <a href="https://core.trac.wordpress.org/ticket/53399">#53399</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksupportselementsphp">trunk/src/wp-includes/block-supports/elements.php</a></li>
<li><a href="#trunksrcwpincludesblocksupportslayoutphp">trunk/src/wp-includes/block-supports/layout.php</a></li>
<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswptermqueryphp">trunk/src/wp-includes/class-wp-term-query.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocksupportselementsphp"></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/block-supports/elements.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-supports/elements.php 2021-07-01 21:11:48 UTC (rev 51300)
+++ trunk/src/wp-includes/block-supports/elements.php 2021-07-01 21:28:38 UTC (rev 51301)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,9 +12,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $block_content Rendered block content.
- * @param array $block Block object.
- * @return string Filtered block content.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $block_content Rendered block content.
+ * @param array $block Block object.
+ * @return string Filtered block content.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_render_elements_support( $block_content, $block ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link_color = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,11 +23,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"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * For now we only care about link color.
- * This code in the future when we have a public API
- * should take advantage of WP_Theme_JSON::compute_style_properties
- * and work for any element and style.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * For now we only care about link color.
+ * This code in the future when we have a public API
+ * should take advantage of WP_Theme_JSON::compute_style_properties
+ * and work for any element and style.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( null === $link_color ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $block_content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesblocksupportslayoutphp"></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/block-supports/layout.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-supports/layout.php 2021-07-01 21:11:48 UTC (rev 51300)
+++ trunk/src/wp-includes/block-supports/layout.php 2021-07-01 21:28:38 UTC (rev 51301)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,9 +35,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $block_content Rendered block content.
- * @param array $block Block object.
- * @return string Filtered block content.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $block_content Rendered block content.
+ * @param array $block Block object.
+ * @return string Filtered block content.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_render_layout_support_flag( $block_content, $block ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
</span></span></pre></div>
<a id="trunksrcwpincludesclasshttpphp"></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-http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-http.php 2021-07-01 21:11:48 UTC (rev 51300)
+++ trunk/src/wp-includes/class-http.php 2021-07-01 21:28:38 UTC (rev 51301)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Some transports technically allow others, but should not be
</span><span class="cx" style="display: block; padding: 0 10px"> * assumed. Default 'GET'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type float $timeout How long the connection should stay open in seconds. Default 5.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type int $redirection Number of allowed redirects. Not supported by all transports
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type int $redirection Number of allowed redirects. Not supported by all transports.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Default 5.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $httpversion Version of the HTTP protocol to use. Accepts '1.0' and '1.1'.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default '1.0'.
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpqueryphp"></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-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php 2021-07-01 21:11:48 UTC (rev 51300)
+++ trunk/src/wp-includes/class-wp-query.php 2021-07-01 21:28:38 UTC (rev 51301)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Query {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Query vars set by the user
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Query vars set by the user.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $query;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Query vars, after parsing
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Query vars, after parsing.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $query_vars = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Taxonomy query, as passed to get_tax_sql()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Taxonomy query, as passed to get_tax_sql().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var WP_Tax_Query A taxonomy query instance.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $tax_query;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Metadata query container
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Metadata query container.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var WP_Meta_Query A meta query instance.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $meta_query = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Date query container
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Date query container.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var WP_Date_Query A date query instance.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $posts;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The amount of posts for the current query.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The number of posts for the current query.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var int
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $comments;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The amount of comments for the posts.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The number of comments for the posts.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var int
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $comment;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The amount of found posts for the current query.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The number of found posts for the current query.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If limit clause was not used, equals $post_count.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $found_posts = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The amount of pages.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The number of pages.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var int
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $max_num_pages = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The amount of comment pages.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The number of comment pages.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var int
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptermqueryphp"></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-term-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-term-query.php 2021-07-01 21:11:48 UTC (rev 51300)
+++ trunk/src/wp-includes/class-wp-term-query.php 2021-07-01 21:28:38 UTC (rev 51301)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,22 +92,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $query {
</span><span class="cx" style="display: block; padding: 0 10px"> * Optional. Array or query string of term query parameters. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string|array $taxonomy Taxonomy name, or array of taxonomy names, to which results should
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string|array $taxonomy Taxonomy name, or array of taxonomies, to which results should
</ins><span class="cx" style="display: block; padding: 0 10px"> * be limited.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type int|int[] $object_ids Optional. Object ID, or array of object IDs. Results will be
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type int|int[] $object_ids Object ID, or array of object IDs. Results will be
</ins><span class="cx" style="display: block; padding: 0 10px"> * limited to terms associated with these objects.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $orderby Field(s) to order terms by. Accepts:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * * term fields ('name', 'slug', 'term_group', 'term_id', 'id',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * * Term fields ('name', 'slug', 'term_group', 'term_id', 'id',
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'description', 'parent', 'term_order'). Unless `$object_ids`
</span><span class="cx" style="display: block; padding: 0 10px"> * is not empty, 'term_order' is treated the same as 'term_id'.
</span><span class="cx" style="display: block; padding: 0 10px"> * * 'count' to use the number of objects associated with the term.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * * 'include' to match the 'order' of the $include param.
- * * 'slug__in' to match the 'order' of the $slug param.
- * * 'meta_value', 'meta_value_num'.
- * the value of `$meta_key`.
- * the array keys of `$meta_query`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * * 'include' to match the 'order' of the `$include` param.
+ * * 'slug__in' to match the 'order' of the `$slug` param.
+ * * 'meta_value'
+ * * 'meta_value_num'.
+ * * The value of `$meta_key`.
+ * * The array keys of `$meta_query`.
</ins><span class="cx" style="display: block; padding: 0 10px"> * * 'none' to omit the ORDER BY clause.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Defaults to 'name'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Default 'name'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $order Whether to order terms in ascending or descending order.
</span><span class="cx" style="display: block; padding: 0 10px"> * Accepts 'ASC' (ascending) or 'DESC' (descending).
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'ASC'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,14 +117,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int[]|string $include Array or comma/space-separated string of term IDs to include.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int[]|string $exclude Array or comma/space-separated string of term IDs to exclude.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If $include is non-empty, $exclude is ignored.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If `$include` is non-empty, `$exclude` is ignored.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Default empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int[]|string $exclude_tree Array or comma/space-separated string of term IDs to exclude
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * along with all of their descendant terms. If $include is
- * non-empty, $exclude_tree is ignored. Default empty array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * along with all of their descendant terms. If `$include` is
+ * non-empty, `$exclude_tree` is ignored. Default empty array.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type int|string $number Maximum number of terms to return. Accepts ''|0 (all) or any
</span><span class="cx" style="display: block; padding: 0 10px"> * positive number. Default ''|0 (all). Note that $number may
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * not return accurate results when coupled with $object_ids.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * not return accurate results when coupled with `$object_ids`.
</ins><span class="cx" style="display: block; padding: 0 10px"> * See #41796 for details.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $offset The number by which to offset the terms query. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $fields Term fields to query for. Accepts:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,14 +146,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'all'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $count Whether to return a term count. If true, will take precedence
</span><span class="cx" style="display: block; padding: 0 10px"> * over `$fields`. Default false.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string|array $name Optional. Name or array of names to return term(s) for.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string|array $name Name or array of names to return term(s) for.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Default empty.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string|array $slug Optional. Slug or array of slugs to return term(s) for.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string|array $slug Slug or array of slugs to return term(s) for.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Default empty.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type int|int[] $term_taxonomy_id Optional. Term taxonomy ID, or array of term taxonomy IDs,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type int|int[] $term_taxonomy_id Term taxonomy ID, or array of term taxonomy IDs,
</ins><span class="cx" style="display: block; padding: 0 10px"> * to match when querying terms.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $hierarchical Whether to include terms that have non-empty descendants
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * (even if $hide_empty is set to true). Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * (even if `$hide_empty` is set to true). Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $search Search criteria to match terms. Will be SQL-formatted with
</span><span class="cx" style="display: block; padding: 0 10px"> * wildcards before and after. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $name__like Retrieve terms with criteria by which a term is LIKE
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,8 +164,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * quantity of each term's "count" object variable.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $get Whether to return terms regardless of ancestry or whether the
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * terms are empty. Accepts 'all' or empty (disabled).
- * Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * terms are empty. Accepts 'all' or '' (disabled).
+ * Default ''.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type int $child_of Term ID to retrieve child terms of. If multiple taxonomies
</span><span class="cx" style="display: block; padding: 0 10px"> * are passed, `$child_of` is ignored. Default 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $parent Parent term ID to retrieve direct-child terms of.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,9 +174,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This parameter has no effect on non-hierarchical taxonomies.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $cache_domain Unique cache key to be produced when this query is stored in
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * an object cache. Default is 'core'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * an object cache. Default 'core'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type bool $update_term_meta_cache Whether to prime meta caches for matched terms. Default true.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type array $meta_query Optional. Meta query clauses to limit retrieved terms by.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type array $meta_query Meta query clauses to limit retrieved terms by.
</ins><span class="cx" style="display: block; padding: 0 10px"> * See `WP_Meta_Query`. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $meta_key Limit terms to those matching a specific metadata key.
</span><span class="cx" style="display: block; padding: 0 10px"> * Can be used in conjunction with `$meta_value`. Default empty.
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></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/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2021-07-01 21:11:48 UTC (rev 51300)
+++ trunk/src/wp-includes/load.php 2021-07-01 21:28:38 UTC (rev 51301)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,7 +675,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $enable_object_cache Whether to enable loading object-cache.php (if present).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Default true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Default true.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $first_init && apply_filters( 'enable_loading_object_cache_dropin', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'wp_cache_init' ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2021-07-01 21:11:48 UTC (rev 51300)
+++ trunk/src/wp-includes/nav-menu.php 2021-07-01 21:28:38 UTC (rev 51301)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return int[] Associative array of egistered navigation menu IDs keyed by their
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return int[] Associative array of registered navigation menu IDs keyed by their
</ins><span class="cx" style="display: block; padding: 0 10px"> * location name. If none are registered, an empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_nav_menu_locations() {
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></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/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2021-07-01 21:11:48 UTC (rev 51300)
+++ trunk/src/wp-includes/pluggable.php 2021-07-01 21:28:38 UTC (rev 51301)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2785,8 +2785,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $size Square avatar width and height in pixels to retrieve.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $default URL for the default image or a default type. Accepts '404', 'retro', 'monsterid',
</span><span class="cx" style="display: block; padding: 0 10px"> * 'wavatar', 'indenticon', 'mystery', 'mm', 'mysteryman', 'blank', or 'gravatar_default'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Default is the value of the 'avatar_default' option, with a fallback of 'mystery'.
- * @param string $alt Alternative text to use in the avatar image tag. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $alt Alternative text to use in the avatar image tag.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Arguments passed to get_avatar_data(), after processing.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args );
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2021-07-01 21:11:48 UTC (rev 51300)
+++ trunk/src/wp-includes/post.php 2021-07-01 21:28:38 UTC (rev 51301)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1391,7 +1391,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $public Whether a post type is intended for use publicly either via
</span><span class="cx" style="display: block; padding: 0 10px"> * the admin interface or by front-end users. While the default
</span><span class="cx" style="display: block; padding: 0 10px"> * settings of $exclude_from_search, $publicly_queryable, $show_ui,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * and $show_in_nav_menus are inherited from public, each does not
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * and $show_in_nav_menus are inherited from $public, each does not
</ins><span class="cx" style="display: block; padding: 0 10px"> * rely on this relationship and controls a very specific intention.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $hierarchical Whether the post type is hierarchical (e.g. page). Default false.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1417,11 +1417,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * of $show_in_menu.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $show_in_rest Whether to include the post type in the REST API. Set this to true
</span><span class="cx" style="display: block; padding: 0 10px"> * for the post type to be available in the block editor.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $rest_base To change the base url of REST API route. Default is $post_type.
- * @type string $rest_controller_class REST API Controller class name. Default is 'WP_REST_Posts_Controller'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $rest_base To change the base URL of REST API route. Default is $post_type.
+ * @type string $rest_controller_class REST API controller class name. Default is 'WP_REST_Posts_Controller'.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type int $menu_position The position in the menu order the post type should appear. To work,
</span><span class="cx" style="display: block; padding: 0 10px"> * $show_in_menu must be true. Default null (at the bottom).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $menu_icon The url to the icon to be used for this menu. Pass a base64-encoded
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $menu_icon The URL to the icon to be used for this menu. Pass a base64-encoded
</ins><span class="cx" style="display: block; padding: 0 10px"> * SVG using a data URI, which will be colored to match the color scheme
</span><span class="cx" style="display: block; padding: 0 10px"> * -- this should begin with 'data:image/svg+xml;base64,'. Pass the name
</span><span class="cx" style="display: block; padding: 0 10px"> * of a Dashicons helper class to use a font icon, e.g.
</span></span></pre>
</div>
</div>
</body>
</html>