<!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>[48591] trunk/src/wp-includes: Docs: Miscellaneous DocBlock corrections.</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/48591">48591</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/48591","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-07-23 21:53:43 +0000 (Thu, 23 Jul 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'>Docs: Miscellaneous DocBlock corrections.
See <a href="https://core.trac.wordpress.org/ticket/49572">#49572</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesbookmarkphp">trunk/src/wp-includes/bookmark.php</a></li>
<li><a href="#trunksrcwpincludescategoryphp">trunk/src/wp-includes/category.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserphp">trunk/src/wp-includes/class-wp-user.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesbookmarkphp"></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/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/bookmark.php 2020-07-23 21:09:04 UTC (rev 48590)
+++ trunk/src/wp-includes/bookmark.php 2020-07-23 21:53:43 UTC (rev 48591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,9 +14,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|stdClass $bookmark
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond
- * to an stdClass object, an associative array, or a numeric array, respectively.
- * Default OBJECT.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to an stdClass object, an associative array, or a numeric array,
+ * respectively. Default OBJECT.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $filter Optional. How to sanitize bookmark fields. Default 'raw'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|object|null Type returned depends on $output value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludescategoryphp"></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/category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category.php 2020-07-23 21:09:04 UTC (rev 48590)
+++ trunk/src/wp-includes/category.php 2020-07-23 21:53:43 UTC (rev 48591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,9 +80,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.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">- * @param int|object $category Category ID or Category row object
- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N,
- * which correspond to a WP_Term object, an associative array, or a numeric array,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|object $category Category ID or category row object.
+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to a WP_Term object, an associative array, or a numeric array,
</ins><span class="cx" style="display: block; padding: 0 10px"> * respectively. Default OBJECT.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $filter Optional. How to sanitize category fields. Default 'raw'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return object|array|WP_Error|null Category data in type defined by $output parameter.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,8 +116,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $category_path URL containing category slugs.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $full_match Optional. Whether full path should be matched.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N,
- * which correspond to a WP_Term object, an associative array, or a numeric array,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to a WP_Term object, an associative array, or a numeric array,
</ins><span class="cx" style="display: block; padding: 0 10px"> * respectively. Default OBJECT.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Term|array|WP_Error|null Type is based on $output value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,8 +329,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|WP_Term|object $tag A tag ID or object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N,
- * which correspond to a WP_Term object, an associative array, or a numeric array,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to a WP_Term object, an associative array, or a numeric array,
</ins><span class="cx" style="display: block; padding: 0 10px"> * respectively. Default OBJECT.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $filter Optional. How to sanitize tag fields. Default 'raw'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Term|array|WP_Error|null Tag data in type defined by $output parameter.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +371,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0 The `$category` parameter now also accepts a WP_Term object.
</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 array|object|WP_Term $category Category Row object or array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array|object|WP_Term $category Category row object or array.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _make_cat_compat( &$category ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $category ) && ! is_wp_error( $category ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpuserphp"></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-user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user.php 2020-07-23 21:09:04 UTC (rev 48590)
+++ trunk/src/wp-includes/class-wp-user.php 2020-07-23 21:53:43 UTC (rev 48591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,8 +56,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Capabilities that the individual user has been granted outside of those inherited from their role.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var bool[] Array of key/value pairs where keys represent a capability name and boolean values
- * represent whether the user has that capability.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var bool[] Array of key/value pairs where keys represent a capability name
+ * and boolean values represent whether the user has that capability.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $caps = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,8 +81,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * All capabilities the user has, including individual and role based.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var bool[] Array of key/value pairs where keys represent a capability name and boolean values
- * represent whether the user has that capability.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var bool[] Array of key/value pairs where keys represent a capability name
+ * and boolean values represent whether the user has that capability.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $allcaps = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,15 +482,17 @@
</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">- * Retrieves all of the capabilities of the roles of the user, and merges them with individual user capabilities.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves all of the capabilities of the user's roles, and merges them with
+ * individual user capabilities.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * All of the capabilities of the roles of the user are merged with the user's individual capabilities. This means
- * that the user can be denied specific capabilities that their role might have, but the user is specifically denied.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * All of the capabilities of the user's roles are merged with the user's individual
+ * capabilities. This means that the user can be denied specific capabilities that
+ * their role might have, but the user is specifically denied.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.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 bool[] Array of key/value pairs where keys represent a capability name and boolean values
- * represent whether the user has that capability.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool[] Array of key/value pairs where keys represent a capability name
+ * and boolean values represent whether the user has that capability.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_role_caps() {
</span><span class="cx" style="display: block; padding: 0 10px"> $switch_site = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -766,8 +768,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0 Added the `$user` parameter.
</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 bool[] $allcaps Array of key/value pairs where keys represent a capability name and boolean values
- * represent whether the user has that capability.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool[] $allcaps Array of key/value pairs where keys represent a capability name
+ * and boolean values represent whether the user has that capability.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $caps Required primitive capabilities for the requested capability.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Arguments that accompany the requested capability check.
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2020-07-23 21:09:04 UTC (rev 48590)
+++ trunk/src/wp-includes/comment.php 2020-07-23 21:53:43 UTC (rev 48591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,8 +187,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Comment $comment Global comment object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Comment|string|int $comment Comment to retrieve.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to
- * a WP_Comment object, an associative array, or a numeric array, respectively. Default OBJECT.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to a WP_Comment object, an associative array, or a numeric array,
+ * respectively. Default OBJECT.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Comment|array|null Depends on $output value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment( &$comment = null, $output = OBJECT ) {
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2020-07-23 21:09:04 UTC (rev 48590)
+++ trunk/src/wp-includes/functions.php 2020-07-23 21:53:43 UTC (rev 48591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7524,10 +7524,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.2.0 $max_execution_time parameter added.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $directory Full path of a directory.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|array $exclude Optional. Full path of a subdirectory to exclude from the total, or array of
- * paths. Expected without trailing slash(es).
- * @param int $max_execution_time Maximum time to run before giving up. In seconds.
- * The timeout is global and is measured from the moment WordPress started to load.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|array $exclude Optional. Full path of a subdirectory to exclude from the total,
+ * or array of paths. Expected without trailing slash(es).
+ * @param int $max_execution_time Maximum time to run before giving up. In seconds. The timeout is global
+ * and is measured from the moment WordPress started to load.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return int|false|null Size in bytes if a valid directory. False if not. Null if timeout.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function recurse_dirsize( $directory, $exclude = null, $max_execution_time = null ) {
</span></span></pre></div>
<a id="trunksrcwpincludesmetaphp"></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/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/meta.php 2020-07-23 21:09:04 UTC (rev 48590)
+++ trunk/src/wp-includes/meta.php 2020-07-23 21:53:43 UTC (rev 48591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +484,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * or an array of values if it's false.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If the meta field does not exist, the result depends on get_metadata_default().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * By default, an empty string is returned if `$single` is true, or an empty array if it's false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * By default, an empty string is returned if `$single` is true, or an empty array
+ * if it's false.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -591,7 +592,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Retrieves default metadata value for the specified object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * By default, an empty string is returned if `$single` is true, or an empty array if it's false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * By default, an empty string is returned if `$single` is true, or an empty array
+ * if it's false.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1413,7 +1415,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $value;
</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">- // If this meta type does not have sub types, then the default is keyed as an empty string.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If this meta type does not have subtypes, then the default is keyed as an empty string.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $defaults[''] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata = $defaults[''];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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 2020-07-23 21:09:04 UTC (rev 48590)
+++ trunk/src/wp-includes/post.php 2020-07-23 21:53:43 UTC (rev 48591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,8 +633,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Post $post Global post object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $args Optional. User defined arguments for replacing the defaults. Default empty.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to
- * a WP_Post object, an associative array, or a numeric array, respectively. Default OBJECT.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to a WP_Post object, an associative array, or a numeric array,
+ * respectively. Default OBJECT.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post[]|int[] Array of post objects or post IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_children( $args = '', $output = OBJECT ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -751,8 +752,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Post $post Global post object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to
- * a WP_Post object, an associative array, or a numeric array, respectively. Default OBJECT.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to a WP_Post object, an associative array, or a numeric array,
+ * respectively. Default OBJECT.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $filter Optional. Type of filter to apply. Accepts 'raw', 'edit', 'db',
</span><span class="cx" style="display: block; padding: 0 10px"> * or 'display'. Default 'raw'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|array|null Type corresponding to $output on success or null on failure.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3505,10 +3507,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_posts()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Optional. Arguments to retrieve posts. Default empty array.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT or ARRAY_A, which correspond to
- * a WP_Post object or an associative array, respectively. Default ARRAY_A.
- * @return array|false Array of recent posts, where the type of each element is determined by $output parameter.
- * Empty array on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT or ARRAY_A, which
+ * correspond to a WP_Post object or an associative array, respectively.
+ * Default ARRAY_A.
+ * @return array|false Array of recent posts, where the type of each element is determined
+ * by the `$output` parameter. Empty array on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5048,8 +5051,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 3.5.0 Use get_post()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|WP_Post $page Page object or page ID. Passed by reference.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to
- * a WP_Post object, an associative array, or a numeric array, respectively. Default OBJECT.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to a WP_Post object, an associative array, or a numeric array,
+ * respectively. Default OBJECT.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $filter Optional. How the return value should be filtered. Accepts 'raw',
</span><span class="cx" style="display: block; padding: 0 10px"> * 'edit', 'db', 'display'. Default 'raw'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|array|null WP_Post or array on success, null on failure.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5066,8 +5070,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $page_path Page path.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to
- * a WP_Post object, an associative array, or a numeric array, respectively. Default OBJECT.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to a WP_Post object, an associative array, or a numeric array,
+ * respectively. Default OBJECT.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $post_type Optional. Post type or array of post types. Default 'page'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5168,8 +5173,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $page_title Page title.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to
- * a WP_Post object, an associative array, or a numeric array, respectively. Default OBJECT.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to a WP_Post object, an associative array, or a numeric array,
+ * respectively. Default OBJECT.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $post_type Optional. Post type or array of post types. Default 'page'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludesrevisionphp"></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/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/revision.php 2020-07-23 21:09:04 UTC (rev 48590)
+++ trunk/src/wp-includes/revision.php 2020-07-23 21:53:43 UTC (rev 48591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,8 +354,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|WP_Post $post The post ID or object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to
- * a WP_Post object, an associative array, or a numeric array, respectively. Default OBJECT.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to a WP_Post object, an associative array, or a numeric array,
+ * respectively. Default OBJECT.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $filter Optional sanitation filter. See sanitize_post().
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2020-07-23 21:09:04 UTC (rev 48590)
+++ trunk/src/wp-includes/taxonomy.php 2020-07-23 21:53:43 UTC (rev 48591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -839,18 +839,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see sanitize_term_field() The $context param lists the available values for get_term_by() $filter param.
</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 int|WP_Term|object $term If integer, term data will be fetched from the database, or from the cache if
- * available. If stdClass object (as in the results of a database query), will apply
- * filters and return a `WP_Term` object corresponding to the `$term` data. If
- * `WP_Term`, will return `$term`.
- * @param string $taxonomy Optional. Taxonomy name that $term is part of.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|WP_Term|object $term If integer, term data will be fetched from the database,
+ * or from the cache if available.
+ * If stdClass object (as in the results of a database query),
+ * will apply filters and return a `WP_Term` object with the `$term` data.
+ * If `WP_Term`, will return `$term`.
+ * @param string $taxonomy Optional. Taxonomy name that `$term` is part of.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * correspond toa WP_Term object, an associative array, or a numeric array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * correspond to a WP_Term object, an associative array, or a numeric array,
</ins><span class="cx" style="display: block; padding: 0 10px"> * respectively. Default OBJECT.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $filter Optional. How to sanitize term fields. Default 'raw'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return WP_Term|array|WP_Error|null Object of the type specified by `$output` on success. When `$output` is 'OBJECT',
- * a WP_Term instance is returned. If taxonomy does not exist, a WP_Error is
- * returned. Returns null for miscellaneous failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Term|array|WP_Error|null WP_Term instance (or array) on success, depending on the `$output` value.
+ * WP_Error if `$taxonomy` does not exist. Null for miscellaneous failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $term ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -956,11 +956,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $field Either 'slug', 'name', 'id' or 'ID' (term_id), or 'term_taxonomy_id'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|int $value Search for this term value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Taxonomy name. Optional, if `$field` is 'term_taxonomy_id'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to
- * a WP_Term object, an associative array, or a numeric array, respectively. Default OBJECT.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to a WP_Term object, an associative array, or a numeric array,
+ * respectively. Default OBJECT.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $filter Optional. How to sanitize term fields. Default 'raw'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return WP_Term|array|false WP_Term instance (or array) on success. Will return false if `$taxonomy` does not exist
- * or `$term` was not found.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Term|array|false WP_Term instance (or array) on success, depending on the `$output` value.
+ * False if `$taxonomy` does not exist or `$term` was not found.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_term_by( $field, $value, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludeswpdbphp"></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/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wp-db.php 2020-07-23 21:09:04 UTC (rev 48590)
+++ trunk/src/wp-includes/wp-db.php 2020-07-23 21:53:43 UTC (rev 48591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2576,9 +2576,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|null $query SQL query.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $output Optional. The required return type. Possible values include
- * OBJECT, ARRAY_A, or ARRAY_N, which correspond to an stdClass object,
- * an associative array, or a numeric array, respectively. Default OBJECT.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ * correspond to an stdClass object, an associative array, or a numeric array,
+ * respectively. Default OBJECT.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param int $y Optional. Row to return. Indexed from 0.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|object|null|void Database query result in format specified by $output or null on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>