<!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>[49597] trunk: Docs: Various docblock corrections and improvements.</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/49597">49597</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/49597","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>2020-11-14 16:33:52 +0000 (Sat, 14 Nov 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Docs: Various docblock corrections and improvements.
See <a href="https://core.trac.wordpress.org/ticket/50768">#50768</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkREADMEmd">trunk/README.md</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpstreamsphp">trunk/src/wp-includes/class-wp-http-streams.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesmssitephp">trunk/src/wp-includes/ms-site.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkREADMEmd"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/README.md</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/README.md 2020-11-14 16:21:19 UTC (rev 49596)
+++ trunk/README.md 2020-11-14 16:33:52 UTC (rev 49597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> You will need Node and npm installed on your computer. Node is a JavaScript runtime used for developer tooling, and npm is the package manager included with Node. If you have a package manager installed for your operating system, setup can be as straightforward as:
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> * macOS: `brew install node`
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-* Windows: `choco install nodejs`
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+* Windows: `choco install node`
</ins><span class="cx" style="display: block; padding: 0 10px"> * Ubuntu: `apt install nodejs npm`
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> If you are not using a package manager, see the [Node.js download page](https://nodejs.org/en/download/) for installers and binaries.
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2020-11-14 16:21:19 UTC (rev 49596)
+++ trunk/src/wp-includes/category-template.php 2020-11-14 16:33:52 UTC (rev 49597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1153,7 +1153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $post_id Post ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int|WP_Post $post_id Post ID or object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Term[]|false|WP_Error Array of WP_Term objects on success, false if there are no terms
</span><span class="cx" style="display: block; padding: 0 10px"> * or the post does not exist, WP_Error on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpstreamsphp"></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-http-streams.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-streams.php 2020-11-14 16:21:19 UTC (rev 49596)
+++ trunk/src/wp-includes/class-wp-http-streams.php 2020-11-14 16:33:52 UTC (rev 49597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ssl_verify = isset( $parsed_args['sslverify'] ) && $parsed_args['sslverify'];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_local ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters whether SSL should be verified for local requests.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters whether SSL should be verified for local HTTP API requests.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.1.0 The `$url` parameter was added.
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2020-11-14 16:21:19 UTC (rev 49596)
+++ trunk/src/wp-includes/deprecated.php 2020-11-14 16:33:52 UTC (rev 49597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1911,6 +1911,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $src = wp_mime_type_icon( $post->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // No thumb, no image. We'll look for a mime-related icon instead.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This filter is documented in wp-includes/post.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
</span><span class="cx" style="display: block; padding: 0 10px"> $src_file = $icon_dir . '/' . wp_basename($src);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></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/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2020-11-14 16:21:19 UTC (rev 49596)
+++ trunk/src/wp-includes/general-template.php 2020-11-14 16:33:52 UTC (rev 49597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2585,7 +2585,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $format Optional. PHP date format. Defaults to the 'date_format' option.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default current post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|false Date the current post was modified. False on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|int|false Date the current post was modified. False on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_the_modified_date( $format = '', $post = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2605,9 +2605,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0 Added the `$post` 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 string|false $the_time The formatted date or false if no post is found.
- * @param string $format PHP date format.
- * @param WP_Post|null $post WP_Post object or null if no post is found.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|int|false $the_time The formatted date or false if no post is found.
+ * @param string $format PHP date format.
+ * @param WP_Post|null $post WP_Post object or null if no post is found.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'get_the_modified_date', $the_time, $format, $post );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2831,7 +2831,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * was modified. Accepts 'G', 'U', or PHP date format.
</span><span class="cx" style="display: block; padding: 0 10px"> * Defaults to the 'time_format' option.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default current post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|false Formatted date string or Unix timestamp. False on failure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|int|false Formatted date string or Unix timestamp. False on failure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_the_modified_time( $format = '', $post = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2851,10 +2851,10 @@
</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 4.6.0 Added the `$post` 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 string|false $the_time The formatted time or false if no post is found.
- * @param string $format Format to use for retrieving the time the post
- * was modified. Accepts 'G', 'U', or PHP date format.
- * @param WP_Post|null $post WP_Post object or null if no post is found.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|int|false $the_time The formatted time or false if no post is found.
+ * @param string $format Format to use for retrieving the time the post
+ * was modified. Accepts 'G', 'U', or PHP date format.
+ * @param WP_Post|null $post WP_Post object or null if no post is found.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'get_the_modified_time', $the_time, $format, $post );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2908,10 +2908,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.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">- * @param string $time The formatted time.
- * @param string $format Format to use for retrieving the time the post was modified.
- * Accepts 'G', 'U', or PHP date format. Default 'U'.
- * @param bool $gmt Whether to retrieve the GMT time. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|int $time Formatted date string or Unix timestamp if `$format` is 'U' or 'G'.
+ * @param string $format Format to use for retrieving the time the post was modified.
+ * Accepts 'G', 'U', or PHP date format. Default 'U'.
+ * @param bool $gmt Whether to retrieve the GMT time. Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'get_post_modified_time', $time, $format, $gmt );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2020-11-14 16:21:19 UTC (rev 49596)
+++ trunk/src/wp-includes/media.php 2020-11-14 16:33:52 UTC (rev 49597)
</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"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.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">- * @global int $content_width
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global int $content_width
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $width Width of the image in pixels.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $height Height of the image in pixels.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1081,7 +1081,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.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">- * @param array $attr Array of attribute values for the image markup, keyed by attribute name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string[] $attr Array of attribute values for the image markup, keyed by attribute name.
</ins><span class="cx" style="display: block; padding: 0 10px"> * See wp_get_attachment_image().
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $attachment Image attachment post.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|int[] $size Requested image size. Can be any registered image size name, or
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1109,7 +1109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|int[] $size Requested image size. Can be any registered image size name, or
</span><span class="cx" style="display: block; padding: 0 10px"> * an array of width and height values in pixels (in that order).
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $icon Whether the image should be treated as an icon.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $attr Array of attribute values for the image markup, keyed by attribute name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string[] $attr Array of attribute values for the image markup, keyed by attribute name.
</ins><span class="cx" style="display: block; padding: 0 10px"> * See wp_get_attachment_image().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'wp_get_attachment_image', $html, $attachment_id, $size, $icon, $attr );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1237,7 +1237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $image_src The 'src' of the image.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $attachment_id Optional. The image attachment ID. Default 0.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|bool The 'srcset' attribute value. False on error or when only one source exists.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|false The 'srcset' attribute value. False on error or when only one source exists.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1476,7 +1476,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default null.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $attachment_id Optional. Image attachment ID. Either `$image_meta` or `$attachment_id`
</span><span class="cx" style="display: block; padding: 0 10px"> * is needed when using the image size name as argument for `$size`. Default 0.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string|bool A valid source size value for use in a 'sizes' attribute or false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|false A valid source size value for use in a 'sizes' attribute or false.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_calculate_image_sizes( $size, $image_src = null, $image_meta = null, $attachment_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $width = 0;
</span></span></pre></div>
<a id="trunksrcwpincludesmssitephp"></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/ms-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-site.php 2020-11-14 16:21:19 UTC (rev 49596)
+++ trunk/src/wp-includes/ms-site.php 2020-11-14 16:33:52 UTC (rev 49597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -860,8 +860,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (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">- * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir()
- * @param int $site_id The site ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $basedir Uploads path without subdirectory. @see wp_upload_dir()
+ * @param int $site_id The site ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $dir = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $site->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $dir = rtrim( $dir, DIRECTORY_SEPARATOR );
</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-11-14 16:21:19 UTC (rev 49596)
+++ trunk/src/wp-includes/taxonomy.php 2020-11-14 16:33:52 UTC (rev 49597)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2048,8 +2048,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|int[] $object_ids The ID(s) of the object(s) to retrieve.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|string[] $taxonomies The taxonomy names to retrieve terms from.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $args See WP_Term_Query::__construct() for supported arguments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|WP_Error The requested term data or empty array if no terms found.
- * WP_Error if any of the taxonomies don't exist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Term[]|WP_Error Array of terms or empty array if no terms found.
+ * WP_Error if any of the taxonomies don't exist.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_object_terms( $object_ids, $taxonomies, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $object_ids ) || empty( $taxonomies ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2125,11 +2125,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.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">- * @param array $terms Array of terms for the given object or objects.
- * @param int[] $object_ids Array of object IDs for which terms were retrieved.
- * @param string[] $taxonomies Array of taxonomy names from which terms were retrieved.
- * @param array $args Array of arguments for retrieving terms for the given
- * object(s). See wp_get_object_terms() for details.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Term[] $terms Array of terms for the given object or objects.
+ * @param int[] $object_ids Array of object IDs for which terms were retrieved.
+ * @param string[] $taxonomies Array of taxonomy names from which terms were retrieved.
+ * @param array $args Array of arguments for retrieving terms for the given
+ * object(s). See wp_get_object_terms() for details.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = apply_filters( 'get_object_terms', $terms, $object_ids, $taxonomies, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2144,11 +2144,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.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">- * @param array $terms Array of terms for the given object or objects.
- * @param int[] $object_ids Array of object IDs for which terms were retrieved.
- * @param string[] $taxonomies Array of taxonomy names from which terms were retrieved.
- * @param array $args Array of arguments for retrieving terms for the given
- * object(s). See wp_get_object_terms() for details.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Term[] $terms Array of terms for the given object or objects.
+ * @param string $object_ids Comma separated list if object IDs for which terms were retrieved.
+ * @param string $taxonomies SQL fragment of taxonomy names from which terms were retrieved.
+ * @param array $args Array of arguments for retrieving terms for the given
+ * object(s). See wp_get_object_terms() for details.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'wp_get_object_terms', $terms, $object_ids, $taxonomies, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>