<!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>[48408] trunk/src: 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/48408">48408</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/48408","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-08 13:13:50 +0000 (Wed, 08 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="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<li><a href="#trunksrcwpincludesnavmenutemplatephp">trunk/src/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestattachmentscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpautomaticupdaterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-automatic-updater.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2020-07-08 11:13:22 UTC (rev 48407)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2020-07-08 13:13:50 UTC (rev 48408)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -944,9 +944,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $unique_failures = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // When only failures have occurred, an email should only be sent if there are unique failures.
- // A failure is considered unique if an email has not been sent for an update attempt failure
- // to a plugin or theme with the same new_version.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * When only failures have occurred, an email should only be sent if there are unique failures.
+ * A failure is considered unique if an email has not been sent for an update attempt failure
+ * to a plugin or theme with the same new_version.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'fail' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $failed_updates as $update_type => $failures ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $failures as $failed_update ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1043,9 +1045,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body[] = __( 'These plugins failed to update:' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $failed_updates['plugin'] as $item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $body[] = "- {$item->name}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body[] = "- {$item->name}";
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $past_failure_emails[ $item->item->plugin ] = $item->item->new_version;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1054,9 +1058,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body[] = __( 'These themes failed to update:' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $failed_updates['theme'] as $item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $body[] = "- {$item->name}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body[] = "- {$item->name}";
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $past_failure_emails[ $item->item->theme ] = $item->item->new_version;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1071,8 +1077,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $successful_updates['plugin'] as $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body[] = "- {$item->name}";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $past_failure_emails[ $item->item->plugin ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1079,11 +1087,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // List successful theme updates.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $successful_updates['theme'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body[] = __( 'These themes are now up to date:' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // List successful updates.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $successful_updates['theme'] as $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body[] = "- {$item->name}";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $past_failure_emails[ $item->item->theme ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="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-08 11:13:22 UTC (rev 48407)
+++ trunk/src/wp-includes/meta.php 2020-07-08 13:13:50 UTC (rev 48408)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1226,10 +1226,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Valid values are 'string', 'boolean', 'integer', 'number', 'array', and 'object'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $description A description of the data attached to this meta key.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $single Whether the meta key has one value per object, or an array of values per object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type mixed $default The default value returned from {@see get_metadata()} if no value has been set yet.
- * When using a non-single meta key, the default value is for the first entry. In other
- * words, when calling {@see get_metadata()} with `$single` set to `false`, the default
- * value given here will be wrapped in an array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type mixed $default The default value returned from get_metadata() if no value has been set yet.
+ * When using a non-single meta key, the default value is for the first entry.
+ * In other words, when calling get_metadata() with `$single` set to `false`,
+ * the default value given here will be wrapped in an array.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $sanitize_callback A function or method to call when sanitizing `$meta_key` data.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $auth_callback Optional. A function or method to call when performing edit_post_meta,
</span><span class="cx" style="display: block; padding: 0 10px"> * add_post_meta, and delete_post_meta capability checks.
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenutemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu-template.php 2020-07-08 11:13:22 UTC (rev 48407)
+++ trunk/src/wp-includes/nav-menu-template.php 2020-07-08 13:13:50 UTC (rev 48408)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,7 +301,7 @@
</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">- * Add the class property classes for the current context, if applicable.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Adds the class property classes for the current context, if applicable.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,7 +592,7 @@
</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">- * Retrieve the HTML list content for nav menu items.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieves the HTML list content for nav menu items.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses Walker_Nav_Menu to create HTML list content.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestattachmentscontrollerphp"></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/rest-api/endpoints/class-wp-rest-attachments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php 2020-07-08 11:13:22 UTC (rev 48407)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php 2020-07-08 13:13:50 UTC (rev 48408)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,9 +460,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">- // If the file doesn't exist, attempt a URL fopen on the src link.
- // This can occur with certain file replication plugins.
- // Keep the original file path to get a modified name later.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the file doesn't exist, attempt a URL fopen on the src link.
+ * This can occur with certain file replication plugins.
+ * Keep the original file path to get a modified name later.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_file_to_edit = $image_file;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( $image_file_to_edit ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_file_to_edit = _load_image_to_edit_path( $attachment_id );
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets.php 2020-07-08 11:13:22 UTC (rev 48407)
+++ trunk/src/wp-includes/widgets.php 2020-07-08 13:13:50 UTC (rev 48408)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1656,7 +1656,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif; // end of display options
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ endif; // End of display options.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $default_inputs ) as $input ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'hidden' === $inputs[ $input ] ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $id = str_replace( '_', '-', $input );
</span></span></pre>
</div>
</div>
</body>
</html>