<!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>[47233] trunk: Administration: Capitalize `Trash` consistently in various messages and comments.</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/47233">47233</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/47233","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-02-10 04:10:09 +0000 (Mon, 10 Feb 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'>Administration: Capitalize `Trash` consistently in various messages and comments.
When used as a noun referring to the "virtual" place, `Trash` should be capitalized.
Props garrett-eclipse, aandrewdixon, Presskopp.
Fixes <a href="https://core.trac.wordpress.org/ticket/45317">#45317</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadmineditcommentsjs">trunk/src/js/_enqueues/admin/edit-comments.js</a></li>
<li><a href="#trunksrcjs_enqueueswpcustomizewidgetsjs">trunk/src/js/_enqueues/wp/customize/widgets.js</a></li>
<li><a href="#trunksrcjsmediaviewsattachmentdetailsjs">trunk/src/js/media/views/attachment/details.js</a></li>
<li><a href="#trunksrcwpadminadminphp">trunk/src/wp-admin/admin.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminoptionsdiscussionphp">trunk/src/wp-admin/options-discussion.php</a></li>
<li><a href="#trunksrcwpadminoptionsprivacyphp">trunk/src/wp-admin/options-privacy.php</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpposttypephp">trunk/src/wp-includes/class-wp-post-type.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestcommentscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestpostscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestrevisionscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunktestsphpunitdataformattingwholepostsphp">trunk/tests/phpunit/data/formatting/whole-posts.php</a></li>
<li><a href="#trunktestsqunitfixtureswpapigeneratedjs">trunk/tests/qunit/fixtures/wp-api-generated.js</a></li>
<li><a href="#trunktestsqunitindexhtml">trunk/tests/qunit/index.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadmineditcommentsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/edit-comments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/edit-comments.js 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/js/_enqueues/admin/edit-comments.js 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,7 +538,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // The comment is currently pending.
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( unapproved ) {
</span><span class="cx" style="display: block; padding: 0 10px"> pendingDiff = -1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The comment was in the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The comment was in the Trash.
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( trashed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> trashDiff = -1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcjs_enqueueswpcustomizewidgetsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/customize/widgets.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/widgets.js 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/js/_enqueues/wp/customize/widgets.js 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1864,7 +1864,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> removedControl.container.remove();
</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">- // Move widget to inactive widgets sidebar (move it to trash) if has been previously saved.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move widget to inactive widgets sidebar (move it to Trash) if has been previously saved.
</ins><span class="cx" style="display: block; padding: 0 10px"> // This prevents the inactive widgets sidebar from overflowing with throwaway widgets.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( api.Widgets.savedWidgetIds[removedWidgetId] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> inactiveWidgets = api.value( 'sidebars_widgets[wp_inactive_widgets]' )().slice();
</span></span></pre></div>
<a id="trunksrcjsmediaviewsattachmentdetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/attachment/details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/attachment/details.js 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/js/media/views/attachment/details.js 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,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">- * Sets the trash state on an attachment, or destroys the model itself.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Sets the Trash state on an attachment, or destroys the model itself.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * If the mediaTrash setting is set to true, trashes the attachment.
</span><span class="cx" style="display: block; padding: 0 10px"> * Otherwise, the model itself is destroyed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.getFocusableElements();
</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 in the Media Library and the Media trash is enabled.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // When in the Media Library and the Media Trash is enabled.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( wp.media.view.settings.mediaTrash &&
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit-metadata' === this.controller.content.mode() ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminadminphp"></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/admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-admin/admin.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> auth_redirect();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Schedule trash collection.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Schedule Trash collection.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_event( time(), 'daily', 'wp_scheduled_delete' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadmineditphp"></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/edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-admin/edit.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,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"> if ( 'delete_all' === $doaction ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Prepare for deletion of all posts with a specified post status (i.e. Empty trash).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prepare for deletion of all posts with a specified post status (i.e. Empty Trash).
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_status = preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px"> // Validate the post status exists.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_status_object( $post_status ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<ul>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<li>' . __( '<strong>Edit</strong> takes you to the editing screen for that post. You can also reach that screen by clicking on the post title.' ) . '</li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<li>' . __( '<strong>Quick Edit</strong> provides inline access to the metadata of your post, allowing you to update post details without leaving this screen.' ) . '</li>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<li>' . __( '<strong>Trash</strong> removes your post from this list and places it in the trash, from which you can permanently delete it.' ) . '</li>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<li>' . __( '<strong>Trash</strong> removes your post from this list and places it in the Trash, from which you can permanently delete it.' ) . '</li>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<li>' . __( '<strong>Preview</strong> will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post’s status.' ) . '</li>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '</ul>',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,7 +266,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'bulk-actions',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Bulk Actions' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' =>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'You can also edit or move multiple posts to the Trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.' ) . '</p>',
</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="trunksrcwpadminincludesajaxactionsphp"></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/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,7 +716,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_untrash_comment( $comment );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Undo trash, not in trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Undo trash, not in Trash.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_POST['comment_status'] ) || 'trash' !== $_POST['comment_status'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $delta = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -861,7 +861,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">- * Ajax handler for sending a post to the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ajax handler for sending a post to the Trash.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -897,7 +897,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">- * Ajax handler to restore a post from the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ajax handler to restore a post from the Trash.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></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-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +493,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"> * Return if the post type doesn't have post formats, or there are no posts using formats,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * or if we're in the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * or if we're in the Trash.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_object_in_taxonomy( $post_type, 'post_format' ) || ! $used_post_formats || $this->is_trash ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></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/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-admin/includes/template.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +525,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">- * Output 'undo move to trash' text for comments
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Output 'undo move to Trash' text for comments
</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">@@ -535,7 +535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="trash-undo-inside">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Comment author, filled by AJAX. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Comment by %s moved to the trash.' ), '<strong></strong>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Comment by %s moved to the Trash.' ), '<strong></strong>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="undo untrash"><a href="#"><?php _e( 'Undo' ); ?></a></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="trunksrcwpadminoptionsdiscussionphp"></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/options-discussion.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-discussion.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-admin/options-discussion.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +206,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Comment Blocklist' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Blocklist' ); ?></span></legend>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><label for="blacklist_keys"><?php _e( 'When a comment contains any of these words in its content, name, URL, email, or IP address, it will be put in the trash. One word or IP address per line. It will match inside words, so “press” will match “WordPress”.' ); ?></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><label for="blacklist_keys"><?php _e( 'When a comment contains any of these words in its content, name, URL, email, or IP address, it will be put in the Trash. One word or IP address per line. It will match inside words, so “press” will match “WordPress”.' ); ?></label></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="trunksrcwpadminoptionsprivacyphp"></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/options-privacy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-privacy.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-admin/options-privacy.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'page_for_privacy_policy',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to Pages Trash. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'The currently selected Privacy Policy page is in the trash. Please create or select a new Privacy Policy page or <a href="%s">restore the current page</a>.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'The currently selected Privacy Policy page is in the Trash. Please create or select a new Privacy Policy page or <a href="%s">restore the current page</a>.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'edit.php?post_status=trash&post_type=page'
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'error'
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></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/upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upload.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-admin/upload.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,10 +328,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['trashed'] ) && absint( $_GET['trashed'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $trashed = absint( $_GET['trashed'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $trashed ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = __( 'Media file moved to the trash.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = __( 'Media file moved to the Trash.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of media files. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = _n( '%s media file moved to the trash.', '%s media files moved to the trash.', $trashed );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = _n( '%s media file moved to the Trash.', '%s media files moved to the Trash.', $trashed );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( $message, number_format_i18n( $trashed ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,10 +341,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['untrashed'] ) && absint( $_GET['untrashed'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $untrashed = absint( $_GET['untrashed'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $untrashed ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = __( 'Media file restored from the trash.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = __( 'Media file restored from the Trash.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of media files. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = _n( '%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = _n( '%s media file restored from the Trash.', '%s media files restored from the Trash.', $untrashed );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( $message, number_format_i18n( $untrashed ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'untrashed' ), $_SERVER['REQUEST_URI'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,8 +353,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[1] = __( 'Media file updated.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[2] = __( 'Media file permanently deleted.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[3] = __( 'Error saving media file.' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$messages[4] = __( 'Media file moved to the trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
-$messages[5] = __( 'Media file restored from the trash.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$messages[4] = __( 'Media file moved to the Trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
+$messages[5] = __( 'Media file restored from the Trash.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $messages[ $_GET['message'] ];
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></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-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2541,7 +2541,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->dismiss_user_auto_draft_changesets();
</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">- // Note that if the changeset status was publish, then it will get set to trash if revisions are not supported.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Note that if the changeset status was publish, then it will get set to Trash if revisions are not supported.
</ins><span class="cx" style="display: block; padding: 0 10px"> $response['changeset_status'] = $changeset_post->post_status;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_publish && 'trash' === $response['changeset_status'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $response['changeset_status'] = 'publish';
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpposttypephp"></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-post-type.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-post-type.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-includes/class-wp-post-type.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,7 +250,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Whether to delete posts of this type when deleting a user.
</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 true, posts of this type belonging to the user will be moved to trash when then user is deleted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If true, posts of this type belonging to the user will be moved to Trash when then user is deleted.
</ins><span class="cx" style="display: block; padding: 0 10px"> * If false, posts of this type belonging to the user will *not* be trashed or deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> * If not set (the default), posts are trashed if post_type_supports( 'author' ).
</span><span class="cx" style="display: block; padding: 0 10px"> * Otherwise posts are not trashed or deleted. Default null.
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></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-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3644,7 +3644,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Delete a comment.
</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, the comment will be moved to the trash instead of deleted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * By default, the comment will be moved to the Trash instead of deleted.
</ins><span class="cx" style="display: block; padding: 0 10px"> * See wp_delete_comment() for more information on this behavior.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span></span></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-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-includes/comment.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1364,8 +1364,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Trashes or deletes a comment.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The comment is moved to trash instead of permanently deleted unless trash is
- * disabled, item is already in the trash, or $force_delete is true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The comment is moved to Trash instead of permanently deleted unless Trash is
+ * disabled, item is already in the Trash, or $force_delete is true.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The post comment count will be updated if the comment was approved and has a
</span><span class="cx" style="display: block; padding: 0 10px"> * post ID available.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1375,7 +1375,7 @@
</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|WP_Comment $comment_id Comment ID or WP_Comment object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $force_delete Whether to bypass trash and force deletion. Default is false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $force_delete Whether to bypass Trash and force deletion. Default is false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool True on success, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_delete_comment( $comment_id, $force_delete = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1445,7 +1445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Moves a comment to the Trash
</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 trash is disabled, comment is permanently deleted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If Trash is disabled, comment is permanently deleted.
</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></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></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/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-includes/link-template.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1448,7 +1448,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|WP_Post $id Optional. Post ID or post object. Default is the global `$post`.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $deprecated Not used.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $force_delete Optional. Whether to bypass trash and force deletion. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $force_delete Optional. Whether to bypass Trash and force deletion. Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string|void The delete post link URL for the given post.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1481,7 +1481,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $link The delete link.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id Post ID.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $force_delete Whether to bypass the trash and force deletion. Default false.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $force_delete Whether to bypass the Trash and force deletion. 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_delete_post_link', wp_nonce_url( $delete_link, "$action-post_{$post->ID}" ), $post->ID, $force_delete );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-includes/post.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1399,7 +1399,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * ?{query_var_string}={post_slug} will be valid.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $can_export Whether to allow this post type to be exported. Default true.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool $delete_with_user Whether to delete posts of this type when deleting a user. If true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * posts of this type belonging to the user will be moved to trash
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * posts of this type belonging to the user will be moved to Trash
</ins><span class="cx" style="display: block; padding: 0 10px"> * when then user is deleted. If false, posts of this type belonging
</span><span class="cx" style="display: block; padding: 0 10px"> * to the user will *not* be trashed or deleted. If not set (the default),
</span><span class="cx" style="display: block; padding: 0 10px"> * posts are trashed if post_type_supports('author'). Otherwise posts
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1639,7 +1639,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - `view_items` - Label for viewing post type archives. Default is 'View Posts' / 'View Pages'.
</span><span class="cx" style="display: block; padding: 0 10px"> * - `search_items` - Label for searching plural items. Default is 'Search Posts' / 'Search Pages'.
</span><span class="cx" style="display: block; padding: 0 10px"> * - `not_found` - Label used when no items are found. Default is 'No posts found' / 'No pages found'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - `not_found_in_trash` - Label used when no items are in the trash. Default is 'No posts found in Trash' /
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - `not_found_in_trash` - Label used when no items are in the Trash. Default is 'No posts found in Trash' /
</ins><span class="cx" style="display: block; padding: 0 10px"> * 'No pages found in Trash'.
</span><span class="cx" style="display: block; padding: 0 10px"> * - `parent_item_colon` - Label used to prefix parents of hierarchical items. Not used on non-hierarchical
</span><span class="cx" style="display: block; padding: 0 10px"> * post types. Default is 'Parent Page:'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2926,8 +2926,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * it is deleted also. This includes comments, post meta fields, and terms
</span><span class="cx" style="display: block; padding: 0 10px"> * associated with the post.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The post or page is moved to trash instead of permanently deleted unless
- * trash is disabled, item is already in the trash, or $force_delete is true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The post or page is moved to Trash instead of permanently deleted unless
+ * Trash is disabled, item is already in the Trash, or $force_delete is true.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2936,7 +2936,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_trash_post()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $postid Optional. Post ID. Default 0.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $force_delete Optional. Whether to bypass Trash and force deletion.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|false|null Post data on success, false 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">@@ -2966,7 +2966,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool|null $delete Whether to go forward with deletion.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post Post object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $force_delete Whether to bypass the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $force_delete Whether to bypass the Trash.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $check = apply_filters( 'pre_delete_post', null, $post, $force_delete );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null !== $check ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3103,7 +3103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Move a post or page to the Trash
</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 trash is disabled, the post or page is permanently deleted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If Trash is disabled, the post or page is permanently deleted.
</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">@@ -3142,7 +3142,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">- * Fires before a post is sent to the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires before a post is sent to the Trash.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3167,7 +3167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_trash_post_comments( $post_id );
</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">- * Fires after a post is sent to the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires after a post is sent to the Trash.
</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">@@ -3211,7 +3211,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">- * Fires before a post is restored from the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires before a post is restored from the Trash.
</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">@@ -3238,7 +3238,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_untrash_post_comments( $post_id );
</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">- * Fires after a post is restored from the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires after a post is restored from the Trash.
</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">@@ -3250,7 +3250,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">- * Moves comments for a post to the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Moves comments for a post to the Trash.
</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">@@ -3270,7 +3270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $post->ID;
</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">- * Fires before comments are sent to the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires before comments are sent to the Trash.
</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">@@ -3296,7 +3296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clean_comment_cache( array_keys( $statuses ) );
</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">- * Fires after comments are sent to the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires after comments are sent to the Trash.
</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">@@ -3309,7 +3309,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">- * Restore comments for a post from the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Restore comments for a post from the Trash.
</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">@@ -3335,7 +3335,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">- * Fires before comments are restored for a post from the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires before comments are restored for a post from the Trash.
</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">@@ -3363,7 +3363,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_id, '_wp_trash_meta_comments_status' );
</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">- * Fires after comments are restored for a post from the trash.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires after comments are restored for a post from the Trash.
</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">@@ -5574,8 +5574,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Deletion removes all post meta fields, taxonomy, comments, etc. associated
</span><span class="cx" style="display: block; padding: 0 10px"> * with the attachment (except the main post).
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The attachment is moved to the trash instead of permanently deleted unless trash
- * for media is disabled, item is already in the trash, or $force_delete is true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The attachment is moved to the Trash instead of permanently deleted unless Trash
+ * for media is disabled, item is already in the Trash, or $force_delete is true.
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5582,7 +5582,7 @@
</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 $post_id Attachment ID.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $force_delete Optional. Whether to bypass Trash and force deletion.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Post|false|null Post data on success, false or null on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestcommentscontrollerphp"></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-comments-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-comments-controller.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'force' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'boolean',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Whether to bypass trash and force deletion.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Whether to bypass Trash and force deletion.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'password' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'The password for the parent post of the comment (if the post is password protected).' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -955,7 +955,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether a comment can be trashed.
</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 false to disable trash support for the post.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Return false to disable Trash support for the post.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestpostscontrollerphp"></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-posts-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-posts-controller.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'force' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'boolean',
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Whether to bypass trash and force deletion.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Whether to bypass Trash and force deletion.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -886,7 +886,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The dynamic portion of the hook name, `$this->post_type`, refers to the post type slug.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Pass false to disable trash support for the post.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Pass false to disable Trash support for the post.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,7 +937,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"> // (Note that internally this falls through to `wp_delete_post()`
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // if the trash is disabled.)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // if the Trash is disabled.)
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = wp_trash_post( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->prepare_item_for_response( $post, $request );
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestrevisionscontrollerphp"></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-revisions-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-revisions-controller.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,8 +475,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.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 WP_Post|false|null $result The revision object (if it was deleted or moved to the trash successfully)
- * or false or null (failure). If the revision was moved to the trash, $result represents
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Post|false|null $result The revision object (if it was deleted or moved to the Trash successfully)
+ * or false or null (failure). If the revision was moved to the Trash, $result represents
</ins><span class="cx" style="display: block; padding: 0 10px"> * its new state; if it was deleted, $result represents its state before deletion.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_REST_Request $request The request sent to the API.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></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/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/src/wp-includes/script-loader.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -926,7 +926,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'upload_stopped' => __( 'Upload stopped.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'dismiss' => __( 'Dismiss' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'crunching' => __( 'Crunching…' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'deleted' => __( 'moved to the trash.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'deleted' => __( 'moved to the Trash.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: File name. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'error_uploading' => __( '“%s” has failed to upload.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunitdataformattingwholepostsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/formatting/whole-posts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/formatting/whole-posts.php 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/tests/phpunit/data/formatting/whole-posts.php 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Cu bonorum graecis ius. Duo id ancillae probatus. Tota latine pri an. Cum ei iudico semper. Eum in blandit voluptaria.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Illud debet vitae ex vis numquam.'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* DIVIDER */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Based on https://core.trac.wordpress.org/attachment/ticket/29557/ChatTranscript.txt
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="triangle-right left">A very significant, if unsurprising update.
</span><span class="cx" style="display: block; padding: 0 10px"> \x93blown away\x94</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <img class="alignleft" src="http://www.example.com/postimages/2013/aarone.jpeg" alt="" width="50" height="50" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p class="triangle-right lefttwo">Blown away by the trash can.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p class="triangle-right lefttwo">Blown away by the Trash can.</p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <img class="alignleft" src="http://www.example.com/postimages/2013/bobm.jpeg" alt="" width="50" height="50" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="triangle-right left">That is one powerful fan.</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <img class="alignright" src="http://www.example.com/postimages/2013/philipmetroid.jpg" alt="" width="50" height="50" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,11 +470,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="triangle-right right">We\'ll even sell you this case that matches to put your drives into!</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <img class="alignleft" src="http://www.example.com/postimages/2013/bobm.jpeg" alt="" width="50" height="50" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="triangle-right left">For a single drive.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Who is going to be the first to mod a real trash can with a RAID array to Thunderbolt?</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Who is going to be the first to mod a real Trash can with a RAID array to Thunderbolt?</p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <img class="alignright" src="http://www.example.com/postimages/2013/philipmetroid.jpg" alt="" width="50" height="50" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="triangle-right right">I can\'t wait to see the enclosures people make to go with this device.</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <img class="alignleft" src="http://www.example.com/postimages/2013/aarone.jpeg" alt="" width="50" height="50" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p class="triangle-right lefttwo">Row of trash cans daisy chained together.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p class="triangle-right lefttwo">Row of Trash cans daisy chained together.</p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <img class="alignright" src="http://www.example.com/postimages/2013/philipmetroid.jpg" alt="" width="50" height="50" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="triangle-right right">Packed and built for expansion.</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <img class="alignleft" src="http://www.example.com/postimages/2013/aarone.jpeg" alt="" width="50" height="50" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -507,7 +507,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="triangle-right left">Not terrible. However, now I need to price out the TOP OF THE LINE model and find out if it can cost more than my house.
</span><span class="cx" style="display: block; padding: 0 10px"> Should be able to do it.</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <img class="alignright" src="http://www.example.com/postimages/2013/philipmetroid.jpg" alt="" width="50" height="50" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p class="triangle-right right">SO RECYCLABLE that you can throw it into the trash... or use it as a trash can.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p class="triangle-right right">SO RECYCLABLE that you can throw it into the Trash... or use it as a Trash can.</p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <img class="alignleft" src="http://www.example.com/postimages/2013/aarone.jpeg" alt="" width="50" height="50" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="triangle-right lefttwo">30k</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <img class="alignright" src="http://www.example.com/postimages/2013/philipmetroid.jpg" alt="" width="50" height="50" />
</span></span></pre></div>
<a id="trunktestsqunitfixtureswpapigeneratedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/fixtures/wp-api-generated.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/wp-api-generated.js 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/tests/qunit/fixtures/wp-api-generated.js 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -709,7 +709,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "force": {
</span><span class="cx" style="display: block; padding: 0 10px"> "required": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "default": false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "description": "Whether to bypass trash and force deletion.",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "description": "Whether to bypass Trash and force deletion.",
</ins><span class="cx" style="display: block; padding: 0 10px"> "type": "boolean"
</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">@@ -1536,7 +1536,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "force": {
</span><span class="cx" style="display: block; padding: 0 10px"> "required": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "default": false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "description": "Whether to bypass trash and force deletion.",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "description": "Whether to bypass Trash and force deletion.",
</ins><span class="cx" style="display: block; padding: 0 10px"> "type": "boolean"
</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">@@ -2306,7 +2306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "force": {
</span><span class="cx" style="display: block; padding: 0 10px"> "required": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "default": false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "description": "Whether to bypass trash and force deletion.",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "description": "Whether to bypass Trash and force deletion.",
</ins><span class="cx" style="display: block; padding: 0 10px"> "type": "boolean"
</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">@@ -2658,7 +2658,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "force": {
</span><span class="cx" style="display: block; padding: 0 10px"> "required": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "default": false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "description": "Whether to bypass trash and force deletion.",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "description": "Whether to bypass Trash and force deletion.",
</ins><span class="cx" style="display: block; padding: 0 10px"> "type": "boolean"
</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">@@ -4312,7 +4312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "force": {
</span><span class="cx" style="display: block; padding: 0 10px"> "required": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "default": false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "description": "Whether to bypass trash and force deletion.",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "description": "Whether to bypass Trash and force deletion.",
</ins><span class="cx" style="display: block; padding: 0 10px"> "type": "boolean"
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "password": {
</span></span></pre></div>
<a id="trunktestsqunitindexhtml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/index.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/index.html 2020-02-10 03:48:45 UTC (rev 47232)
+++ trunk/tests/qunit/index.html 2020-02-10 04:10:09 UTC (rev 47233)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script src="../../build/wp-includes/js/utils.js"></script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- window.pluploadL10n = {"queue_limit_exceeded":"You have attempted to queue too many files.","file_exceeds_size_limit":"%s exceeds the maximum upload size for this site.","zero_byte_file":"This file is empty. Please try another.","invalid_filetype":"Sorry, this file type is not permitted for security reasons.","not_an_image":"This file is not an image. Please try another.","image_memory_exceeded":"Memory exceeded. Please try another smaller file.","image_dimensions_exceeded":"This is larger than the maximum size. Please try another.","default_error":"An error occurred in the upload. Please try again later.","missing_upload_url":"There was a configuration error. Please contact the server administrator.","
upload_limit_exceeded":"You may only upload 1 file.","http_error":"HTTP error.","upload_failed":"Upload failed.","big_upload_failed":"Please try uploading this file with the %1$sbrowser uploader%2$s.","big_upload_queued":"%s exceeds the maximum upload size for the multi-file uploader when used in your browser.","io_error":"IO error.","security_error":"Security error.","file_cancelled":"File canceled.","upload_stopped":"Upload stopped.","dismiss":"Dismiss","crunching":"Crunching\u2026","deleted":"moved to the trash.","error_uploading":"\u201c%s\u201d has failed to upload."};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.pluploadL10n = {"queue_limit_exceeded":"You have attempted to queue too many files.","file_exceeds_size_limit":"%s exceeds the maximum upload size for this site.","zero_byte_file":"This file is empty. Please try another.","invalid_filetype":"Sorry, this file type is not permitted for security reasons.","not_an_image":"This file is not an image. Please try another.","image_memory_exceeded":"Memory exceeded. Please try another smaller file.","image_dimensions_exceeded":"This is larger than the maximum size. Please try another.","default_error":"An error occurred in the upload. Please try again later.","missing_upload_url":"There was a configuration error. Please contact the server administrator.","u
pload_limit_exceeded":"You may only upload 1 file.","http_error":"HTTP error.","upload_failed":"Upload failed.","big_upload_failed":"Please try uploading this file with the %1$sbrowser uploader%2$s.","big_upload_queued":"%s exceeds the maximum upload size for the multi-file uploader when used in your browser.","io_error":"IO error.","security_error":"Security error.","file_cancelled":"File canceled.","upload_stopped":"Upload stopped.","dismiss":"Dismiss","crunching":"Crunching\u2026","deleted":"moved to the Trash.","error_uploading":"\u201c%s\u201d has failed to upload."};
</ins><span class="cx" style="display: block; padding: 0 10px"> window._wpPluploadSettings = {"defaults":{"runtimes":"html5,flash,silverlight,html4","file_data_name":"async-upload","url":"\/wp-admin\/async-upload.php","flash_swf_url":"http:\/\/src.wordpress-develop.dev\/wp-includes\/js\/plupload\/plupload.flash.swf","silverlight_xap_url":"http:\/\/src.wordpress-develop.dev\/wp-includes\/js\/plupload\/plupload.silverlight.xap","filters":{"max_file_size":"2097152b","mime_types":[{"extensions":"jpg,jpeg,jpe,gif,png,bmp,tiff,tif,ico,asf,asx,wmv,wmx,wm,avi,divx,flv,mov,qt,mpeg,mpg,mpe,mp4,m4v,ogv,webm,mkv,3gp,3gpp,3g2,3gp2,txt,asc,c,cc,h,srt,csv,tsv,ics,rtx,css,vtt,dfxp,mp3,m4a,m4b,ra,ram,wav,ogg,oga,mid,midi,wma,wax,mka,rtf,js,pdf,class,tar,zip,gz,gzip,rar,7z,psd,xcf,doc,pot,pps,ppt,wri,xla,xls,xlt,xlw,mdb,mpp,docx,docm,do
tx,dotm,xlsx,xlsm,xlsb,xltx,xltm,xlam,pptx,pptm,ppsx,ppsm,potx,potm,ppam,sldx,sldm,onetoc,onetoc2,onetmp,onepkg,oxps,xps,odt,odp,ods,odg,odc,odb,odf,wp,wpd,key,numbers,pages"}]},"multipart_params":{"action":"upload-attachment","_wpnonce":"87fa5740b8"}},"browser":{"mobile":false,"supported":true},"limitExceeded":false};
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script src="../../build/wp-includes/js/plupload/wp-plupload.js"></script>
</span></span></pre>
</div>
</div>
</body>
</html>