<!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>[53131] trunk: Administration: Remove self-reference ("we") in WordPress Admin.</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/53131">53131</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/53131","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-04-11 11:40:38 +0000 (Mon, 11 Apr 2022)</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: Remove self-reference ("we") in WordPress Admin.
This changes updates many strings to remove self-references to an undefined "we" collective across the WordPress Administration.
The goal of this change is to better match the guidelines and recommendations set forth in the make/core handbook, specifically:
> the word "we" should be avoided (...) unless its made very clear which group is speaking.
Props johnbillion, shital-patel, audrasjb, marybaum, SergeyBiryukov, peterwilsoncc, johnjamesjacoby, kebbet, costdev, chaion07, davidbaumwald.
Fixes <a href="https://core.trac.wordpress.org/ticket/46057">#46057</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadminexportphp">trunk/src/wp-admin/export.php</a></li>
<li><a href="#trunksrcwpadminfreedomsphp">trunk/src/wp-admin/freedoms.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscoreupgraderphp">trunk/src/wp-admin/includes/class-core-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasslanguagepackupgraderphp">trunk/src/wp-admin/includes/class-language-pack-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpprivacypolicycontentphp">trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminnetworkupgradephp">trunk/src/wp-admin/network/upgrade.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminoptionsprivacyphp">trunk/src/wp-admin/options-privacy.php</a></li>
<li><a href="#trunksrcwpadminprivacypolicyguidephp">trunk/src/wp-admin/privacy-policy-guide.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminupgradephp">trunk/src/wp-admin/upgrade.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesthemejson">trunk/src/wp-includes/theme.json</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaaudiophp">trunk/src/wp-includes/widgets/class-wp-widget-media-audio.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp">trunk/src/wp-includes/widgets/class-wp-widget-media-image.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediavideophp">trunk/src/wp-includes/widgets/class-wp-widget-media-video.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaphp">trunk/src/wp-includes/widgets/class-wp-widget-media.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
<li><a href="#trunksrcwploadphp">trunk/src/wp-load.php</a></li>
<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>
<li><a href="#trunksrcwptrackbackphp">trunk/src/wp-trackback.php</a></li>
<li><a href="#trunktestsqunitindexhtml">trunk/tests/qunit/index.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditformadvancedphp"></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-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/edit-form-advanced.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +448,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="lost-connection-notice" class="error hidden">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><span class="spinner"></span> <?php _e( '<strong>Connection lost.</strong> Saving has been disabled until you are reconnected.' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="hide-if-no-sessionstorage"><?php _e( 'We are backing up this post in your browser, just in case.' ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="hide-if-no-sessionstorage"><?php _e( 'This post is being backed up in your browser, just in case.' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <form name="post" action="post.php" method="post" id="post"
</span></span></pre></div>
<a id="trunksrcwpadminexportphp"></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/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/export.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/export.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php echo esc_html( $title ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'When you click the button below WordPress will create an XML file for you to save to your computer.' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php _e( 'This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><?php _e( 'This format, which is called WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Once you’ve saved the download file, you can use the Import function in another WordPress installation to import the content from this site.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Choose what to export' ); ?></h2>
</span></span></pre></div>
<a id="trunksrcwpadminfreedomsphp"></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/freedoms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/freedoms.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/freedoms.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: URL to Plugins screen, 2: URL to Themes screen, 3: https://wordpress.org/about/license/ */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it’s GPL</a> first. If they do not respect the WordPress license, we do not recommend them.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it’s GPL</a> first. If they do not respect the WordPress license, it is not recommended to use them.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugins_url,
</span><span class="cx" style="display: block; padding: 0 10px"> $themes_url,
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/about/license/' )
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscoreupgraderphp"></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-core-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-core-upgrader.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/includes/class-core-upgrader.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_filesystem->copy( $working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->delete( $working_dir, true );
</span><span class="cx" style="display: block; padding: 0 10px"> WP_Upgrader::release_lock( 'core_updater' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update can not be installed because some files could not be copied. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->chmod( $wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasslanguagepackupgraderphp"></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-language-pack-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function upgrade_strings() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->strings['starting_upgrade'] = __( 'Some of your translations need updating. Sit tight for a few more seconds while we update them as well.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->strings['starting_upgrade'] = __( 'Some of your translations need updating. Sit tight for a few more seconds while they are updated as well.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->strings['up_to_date'] = __( 'Your translations are all up to date.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['no_package'] = __( 'Update package not available.' );
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Package URL. */
</span></span></pre></div>
<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 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -778,7 +778,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't show this message if there is a newer version available.
</span><span class="cx" style="display: block; padding: 0 10px"> // Potential for confusion, and also not useful for them to know at this point.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'fail' === $type && ! $newer_version_available ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $body .= __( 'We tried but were unable to update your site automatically.' ) . ' ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body .= __( 'An attempt was made, but your site could not be updated automatically.' ) . ' ';
</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"> $body .= __( 'Updating is easy and only takes a few moments:' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -844,7 +844,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n***\n\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WordPress version. */
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= sprintf( __( 'Your site was running version %s.' ), get_bloginfo( 'version' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $body .= ' ' . __( 'We have some data that describes the error your site encountered.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body .= ' ' . __( 'Some data that describes the error your site encountered has been put together.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we had a rollback and we're still critical, then the rollback failed too.
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpprivacypolicycontentphp"></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-privacy-policy-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -591,7 +591,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"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h2>' . __( 'Where we send your data' ) . '</h2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2>' . __( 'Where your data is sent' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></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-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['folder_exists'] = __( 'Destination folder already exists.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['mkdir_failed'] = __( 'Could not create directory.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['incompatible_archive'] = __( 'The package could not be installed.' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->strings['files_not_writable'] = __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->strings['files_not_writable'] = __( 'The update can not be installed because some files could not be copied. This is usually due to inconsistent file permissions.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['maintenance_start'] = __( 'Enabling Maintenance mode…' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['maintenance_end'] = __( 'Disabling Maintenance mode…' );
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></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/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/includes/dashboard.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1414,7 +1414,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * that they match the expected location before including them.
</span><span class="cx" style="display: block; padding: 0 10px"> * Use endonyms (native locale names) whenever possible.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'We could not locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '%s could not be located. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<em>{{data.unknownCity}}</em>'
</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="trunksrcwpadminincludesupdatecorephp"></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/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/includes/update-core.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -994,7 +994,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'copy_failed_for_version_file',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'The update can not be installed because some files could not be copied. This is usually due to inconsistent file permissions.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp-includes/version.php'
</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="trunksrcwpadminnetworksettingsphp"></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/network/settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/network/settings.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="new_admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="admin-email-desc">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'This address is used for admin purposes. If you change this, we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'This address is used for admin purposes. If you change this, an email will be sent to your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $new_admin_email = get_site_option( 'new_admin_email' );
</span></span></pre></div>
<a id="trunksrcwpadminnetworkupgradephp"></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/network/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/upgrade.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/network/upgrade.php 2022-04-11 11:40:38 UTC (rev 53131)
</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"> if ( (int) get_site_option( 'wpmu_upgrade_site' ) !== $GLOBALS['wp_db_version'] ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Database Update Required' ); ?></h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'WordPress has been updated! Next and final step is to individually upgrade the sites in your network.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
</span></span></pre></div>
<a id="trunksrcwpadminoptionsgeneralphp"></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-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-general.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/options-general.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,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"><label for="new_admin_email"><?php _e( 'Administration Email Address' ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input name="new_admin_email" type="email" id="new_admin_email" aria-describedby="new-admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this, we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this, an email will be sent to your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $new_admin_email = get_option( 'new_admin_email' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $new_admin_email && get_option( 'admin_email' ) !== $new_admin_email ) :
</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 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/options-privacy.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,8 +189,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'However, it is your responsibility to use those resources correctly, to provide the information that your Privacy Policy requires, and to keep that information current and accurate.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'After your Privacy Policy page is set, we suggest that you edit it.' ); ?>
- <?php _e( 'We would also suggest reviewing your Privacy Policy from time to time, especially after installing or updating any themes or plugins. There may be changes or new suggested information for you to consider adding to your policy.' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'After your Privacy Policy page is set, you should edit it.' ); ?>
+ <?php _e( 'It is also suggested that you should review your Privacy Policy from time to time, especially after installing or updating any themes or plugins. There may be changes or new suggested information for you to consider adding to your policy.' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminprivacypolicyguidephp"></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/privacy-policy-guide.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/privacy-policy-guide.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/privacy-policy-guide.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Privacy Policy Guide' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="section-title"><?php _e( 'Introduction' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'This text template will help you to create your web site’s privacy policy.' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'We have suggested the sections you will need. Under each section heading you will find a short summary of what information you should provide, which will help you to get started. Some sections include suggested policy content, others will have to be completed with information from your theme and plugins.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'The template contains a suggestion of sections you most likely will need. Under each section heading you will find a short summary of what information you should provide, which will help you to get started. Some sections include suggested policy content, others will have to be completed with information from your theme and plugins.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Please edit your privacy policy content, making sure to delete the summaries, and adding any information from your theme and plugins. Once you publish your policy page, remember to add it to your navigation menu.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'It is your responsibility to write a comprehensive privacy policy, to make sure it reflects all national and international legal requirements on privacy, and to keep your policy current and accurate.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="privacy-settings-accordion">
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></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/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/setup-config.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,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"> <h1 class="screen-reader-text"><?php _e( 'Before getting started' ); ?></h1>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><?php _e( 'Welcome to WordPress. Before getting started, some information on the database is needed. You will need to know the following items before proceeding.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php _e( 'Database name' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php _e( 'Database username' ); ?></li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +170,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: wp-config.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'We are going to use this information to create a %s file.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'This information is being used to create a %s file.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>'
</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">@@ -187,7 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Documentation URL. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Need more help? <a href="%s">We got it</a>.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Need more help? <a href="%s">Read the support article on wp-config.php</a>.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/article/editing-wp-config-php/' )
</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="trunksrcwpadminupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upgrade.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/upgrade.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,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"> <h1><?php _e( 'Database Update Required' ); ?></h1>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><?php _e( 'WordPress has been updated! Next and final step is to update your database to the newest version.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a class="button button-large button-primary" href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminusereditphp"></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/user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-admin/user-edit.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +514,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="email" name="email" id="email" aria-describedby="email-description" value="<?php echo esc_attr( $profile_user->user_email ); ?>" class="regular-text ltr" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $profile_user->ID === $current_user->ID ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="email-description">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'If you change this, we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e( 'If you change this, an email will be sent at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6963,7 +6963,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match( '|<title>([^<]*?)</title>|is', $remote_source, $matchtitle );
</span><span class="cx" style="display: block; padding: 0 10px"> $title = isset( $matchtitle[1] ) ? $matchtitle[1] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $title ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->pingback_error( 32, __( 'We cannot find a title on that page.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->pingback_error( 32, __( 'A title on that page can not be found.' ) );
</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"> // Remove all script and style tags including their content.
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-includes/ms-functions.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -490,7 +490,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_email( $user_email ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'user_email', __( 'Please enter a valid email address.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_email_address_unsafe( $user_email ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'user_email', __( 'You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add( 'user_email', __( 'You cannot use that email address to signup. There are problems with them blocking some emails from WordPress. Please use another email provider.' ) );
</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"> if ( strlen( $user_name ) < 4 ) {
</span></span></pre></div>
<a id="trunksrcwpincludesthemejson"></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/theme.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.json 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-includes/theme.json 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,47 +13,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "custom": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "customDuotone": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "customGradient": true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "defaultDuotone": true,
</del><span class="cx" style="display: block; padding: 0 10px"> "defaultGradients": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "defaultPalette": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "duotone": [
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "name": "Dark grayscale",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "name": "Dark grayscale" ,
</ins><span class="cx" style="display: block; padding: 0 10px"> "colors": [ "#000000", "#7f7f7f" ],
</span><span class="cx" style="display: block; padding: 0 10px"> "slug": "dark-grayscale"
</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">- "name": "Grayscale",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "name": "Grayscale" ,
</ins><span class="cx" style="display: block; padding: 0 10px"> "colors": [ "#000000", "#ffffff" ],
</span><span class="cx" style="display: block; padding: 0 10px"> "slug": "grayscale"
</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">- "name": "Purple and yellow",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "name": "Purple and yellow" ,
</ins><span class="cx" style="display: block; padding: 0 10px"> "colors": [ "#8c00b7", "#fcff41" ],
</span><span class="cx" style="display: block; padding: 0 10px"> "slug": "purple-yellow"
</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">- "name": "Blue and red",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "name": "Blue and red" ,
</ins><span class="cx" style="display: block; padding: 0 10px"> "colors": [ "#000097", "#ff4747" ],
</span><span class="cx" style="display: block; padding: 0 10px"> "slug": "blue-red"
</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">- "name": "Midnight",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "name": "Midnight" ,
</ins><span class="cx" style="display: block; padding: 0 10px"> "colors": [ "#000000", "#00a5ff" ],
</span><span class="cx" style="display: block; padding: 0 10px"> "slug": "midnight"
</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">- "name": "Magenta and yellow",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "name": "Magenta and yellow" ,
</ins><span class="cx" style="display: block; padding: 0 10px"> "colors": [ "#c7005a", "#fff278" ],
</span><span class="cx" style="display: block; padding: 0 10px"> "slug": "magenta-yellow"
</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">- "name": "Purple and green",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "name": "Purple and green" ,
</ins><span class="cx" style="display: block; padding: 0 10px"> "colors": [ "#a60072", "#67ff66" ],
</span><span class="cx" style="display: block; padding: 0 10px"> "slug": "purple-green"
</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">- "name": "Blue and orange",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "name": "Blue and orange" ,
</ins><span class="cx" style="display: block; padding: 0 10px"> "colors": [ "#1900d8", "#ffa96b" ],
</span><span class="cx" style="display: block; padding: 0 10px"> "slug": "blue-orange"
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaaudiophp"></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/class-wp-widget-media-audio.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media-audio.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-audio.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_media' => _x( 'Edit Audio', 'label for button in the audio widget; should preferably not be longer than ~13 characters long' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'missing_attachment' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to media library. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'We cannot find that audio file. Check your <a href="%s">media library</a> and make sure it was not deleted.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'That audio file can not be found. Check your <a href="%s">media library</a> and make sure it was not deleted.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( admin_url( 'upload.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %d: Widget count. */
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp"></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/class-wp-widget-media-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_media' => _x( 'Edit Image', 'label for button in the image widget; should preferably not be longer than ~13 characters long' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'missing_attachment' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to media library. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'We cannot find that image. Check your <a href="%s">media library</a> and make sure it was not deleted.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'That image can not be found. Check your <a href="%s">media library</a> and make sure it was not deleted.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( admin_url( 'upload.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %d: Widget count. */
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediavideophp"></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/class-wp-widget-media-video.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media-video.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-video.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_media' => _x( 'Edit Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'missing_attachment' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to media library. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'We cannot find that video. Check your <a href="%s">media library</a> and make sure it was not deleted.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'That video can not be found. Check your <a href="%s">media library</a> and make sure it was not deleted.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( admin_url( 'upload.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %d: Widget count. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'media_library_state_multi' => _n_noop( 'Video Widget (%d)', 'Video Widget (%d)' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'media_library_state_single' => __( 'Video Widget' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: A list of valid video file extensions. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'unsupported_file_type' => sprintf( __( 'Sorry, we cannot load the video at the supplied URL. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '<code>.' . implode( '</code>, <code>.', wp_get_video_extensions() ) . '</code>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'unsupported_file_type' => sprintf( __( 'Sorry, the video at the supplied URL can not be loaded. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '<code>.' . implode( '</code>, <code>.', wp_get_video_extensions() ) . '</code>' ),
</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></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaphp"></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/class-wp-widget-media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_to_widget' => __( 'Add to Widget' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'missing_attachment' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to media library. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'We cannot find that file. Check your <a href="%s">media library</a> and make sure it was not deleted.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'That file can not be found. Check your <a href="%s">media library</a> and make sure it was not deleted.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( admin_url( 'upload.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %d: Widget count. */
</span></span></pre></div>
<a id="trunksrcwpincludeswpdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wp-db.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-includes/wp-db.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1186,7 +1186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Database name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'We were able to connect to the database server (which means your username and password is okay) but not able to select the %s database.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'The database server could be connected to (which means your username and password is okay) but the %s database could not be selected.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>' . htmlspecialchars( $db, ENT_QUOTES ) . '</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) . "</p>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1802,7 +1802,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: wp-config.php, 2: Database host. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'This either means that the username and password information in your %1$s file is incorrect or we cannot contact the database server at %2$s. This could mean your host’s database server is down.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'This either means that the username and password information in your %1$s file is incorrect or that contact with the database server at %2$s could not be established. This could mean your host’s database server is down.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) . "</p>\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1961,7 +1961,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Database host. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'This means that we lost contact with the database server at %s. This could mean your host’s database server is down.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'This means that the contact with the database server at %s was lost. This could mean your host’s database server is down.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) . "</p>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-load.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-load.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Documentation URL. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( "Need more help? <a href='%s'>We got it</a>." ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( "Need more help? <a href='%s'>Read the support article on wp-config.php</a>." ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/article/editing-wp-config-php/' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $die .= '<p>' . sprintf(
</span></span></pre></div>
<a id="trunksrcwpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-signup.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-signup.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="error"><?php echo $errmsg; ?></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">- <input name="user_email" type="email" id="user_email" value="<?php echo esc_attr( $user_email ); ?>" maxlength="200" autocomplete="email" /><br /><?php _e( 'We send your registration email to this address. (Double-check your email address before continuing.)' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="user_email" type="email" id="user_email" value="<?php echo esc_attr( $user_email ); ?>" maxlength="200" autocomplete="email" /><br /><?php _e( 'Your registration email is sent to this address. (Double-check your email address before continuing.)' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $errmsg = $errors->get_error_message( 'generic' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $errmsg ) {
</span></span></pre></div>
<a id="trunksrcwptrackbackphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-trackback.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-trackback.php 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/src/wp-trackback.php 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $dupe = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $dupe ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- trackback_response( 1, __( 'We already have a ping from that URL for this post.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ trackback_response( 1, __( 'There is already a ping from that URL for this post.' ) );
</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"> $commentdata = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type' );
</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 2022-04-11 10:59:45 UTC (rev 53130)
+++ trunk/tests/qunit/index.html 2022-04-11 11:40:38 UTC (rev 53131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.mediaWidgets.modelConstructors[ "media_image" ].prototype.schema = {"attachment_id":{"type":"integer","default":0,"minimum":0,"media_prop":"id"},"url":{"type":"string","default":"","format":"uri"},"title":{"type":"string","default":"","should_preview_update":false},"size":{"type":"string","default":"medium","enum":["thumbnail","medium","medium_large","large","twentyseventeen-featured-image","twentyseventeen-thumbnail-avatar","full","custom"]},"width":{"type":"integer","default":0,"minimum":0},"height":{"typ
e":"integer","default":0,"minimum":0},"caption":{"type":"string","default":"","should_preview_update":false},"alt":{"type":"string","default":""},"link_type":{"type":"string","default":"none","enum":["none","file","post","custom"],"media_prop":"link","should_preview_update":false},"link_url":{"type":"string","default":"","format":"uri","media_prop":"linkUrl","should_preview_update":false},"image_classes":{"type":"string","default":"","media_prop":"extraClasses","should_preview_update":false},"link_classes":{"type":&q
uot;string","default":"","media_prop":"linkClassName","should_preview_update":false},"link_rel":{"type":"string","default":"","media_prop":"linkRel","should_preview_update":false},"link_target_blank":{"type":"boolean","default":false,"media_prop":"linkTargetBlank","should_preview_update":false},"image_title":{"type":"string","default":"","media_prop":"title","should_preview_update":false}};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.mediaWidgets.controlConstructors[ "media_image" ].prototype.mime_type = "image";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.extend( wp.mediaWidgets.controlConstructors[ "media_image" ].prototype.l10n, {"no_media_selected":"No image selected","select_media":"Select Image","change_media":"Change Image","edit_media":"Edit Image","add_to_widget":"Add to Widget","missing_attachment":"We cannot find that image. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it was not deleted.","media_library_state_multi":{"0":"Image Widget (%d)","1":"Image Widget (%d)","singular":"Image Widget (%d)","plural":"Image Widget (%d)","context":null,"domain":null},"media_library_state_single":"Im
age Widget"} );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.extend( wp.mediaWidgets.controlConstructors[ "media_image" ].prototype.l10n, {"no_media_selected":"No image selected","select_media":"Select Image","change_media":"Change Image","edit_media":"Edit Image","add_to_widget":"Add to Widget","missing_attachment":"That image can not be found. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it was not deleted.","media_library_state_multi":{"0":"Image Widget (%d)","1":"Image Widget (%d)","singular":"Image Widget (%d)","plural":"Image Widget (%d)","context":null,"domain":null},"media_library_state_single":"I
mage Widget"} );
</ins><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script src="../../build/wp-admin/js/widgets/media-video-widget.js"></script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.mediaWidgets.modelConstructors[ "media_video" ].prototype.schema = {"attachment_id":{"type":"integer","default":0,"minimum":0,"media_prop":"id"},"url":{"type":"string","default":"","format":"uri"},"title":{"type":"string","default":""},"preload":{"type":"string","default":"metadata","enum":["none","auto","metadata"]},"loop":{"type":"boolean","default":false},"content":{"type":"string","default":""},"mp4":{"type":"string","default":"","format":"uri"},"m4v":{"
type":"string","default":"","format":"uri"},"webm":{"type":"string","default":"","format":"uri"},"ogv":{"type":"string","default":"","format":"uri"},"wmv":{"type":"string","default":"","format":"uri"},"flv":{"type":"string","default":"","format":"uri"}};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.mediaWidgets.controlConstructors[ "media_video" ].prototype.mime_type = "video";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.extend( wp.mediaWidgets.controlConstructors[ "media_video" ].prototype.l10n, {"no_media_selected":"No video selected","select_media":"Select Video","change_media":"Change Video","edit_media":"Edit Video","add_to_widget":"Add to Widget","missing_attachment":"We cannot find that video. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it was not deleted.","media_library_state_multi":{"0":"Video Widget (%d)","1":"Video Widget (%d)","singular":"Video Widget (%d)","plural":"Video Widget (%d)","context":null,"domain":null},"media_library_state_single":"Vi
deo Widget"} );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.extend( wp.mediaWidgets.controlConstructors[ "media_video" ].prototype.l10n, {"no_media_selected":"No video selected","select_media":"Select Video","change_media":"Change Video","edit_media":"Edit Video","add_to_widget":"Add to Widget","missing_attachment":"That video can not be found. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it was not deleted.","media_library_state_multi":{"0":"Video Widget (%d)","1":"Video Widget (%d)","singular":"Video Widget (%d)","plural":"Video Widget (%d)","context":null,"domain":null},"media_library_state_single":"V
ideo Widget"} );
</ins><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script src="../../build/wp-admin/js/widgets/media-audio-widget.js"></script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.mediaWidgets.modelConstructors[ "media_audio" ].prototype.schema = {"attachment_id":{"type":"integer","default":0,"minimum":0,"media_prop":"id"},"url":{"type":"string","default":"","format":"uri"},"title":{"type":"string","default":""},"preload":{"type":"string","default":"none","enum":["none","auto","metadata"]},"loop":{"type":"boolean","default":false},"mp3":{"type":"string","default":"","format":"uri"},"ogg":{"type":"string","default":"","format":"uri&quo
t;},"wma":{"type":"string","default":"","format":"uri"},"m4a":{"type":"string","default":"","format":"uri"},"wav":{"type":"string","default":"","format":"uri"}};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.mediaWidgets.controlConstructors[ "media_audio" ].prototype.mime_type = "audio";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.extend( wp.mediaWidgets.controlConstructors[ "media_audio" ].prototype.l10n, {"no_media_selected":"No audio selected","select_media":"Select File","change_media":"Change Audio","edit_media":"Edit Audio","add_to_widget":"Add to Widget","missing_attachment":"We cannot find that audio file. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it was not deleted.","media_library_state_multi":{"0":"Audio Widget (%d)","1":"Audio Widget (%d)","singular":"Audio Widget (%d)","plural":"Audio Widget (%d)","context":null,"domain":null},"media_library_state_single":&quo
t;Audio Widget"} );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.extend( wp.mediaWidgets.controlConstructors[ "media_audio" ].prototype.l10n, {"no_media_selected":"No audio selected","select_media":"Select File","change_media":"Change Audio","edit_media":"Edit Audio","add_to_widget":"Add to Widget","missing_attachment":"That audio file can not be found. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it was not deleted.","media_library_state_multi":{"0":"Audio Widget (%d)","1":"Audio Widget (%d)","singular":"Audio Widget (%d)","plural":"Audio Widget (%d)","context":null,"domain":null},"media_library_state_single":&qu
ot;Audio Widget"} );
</ins><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type='text/javascript' src='../../build/wp-admin/js/widgets/media-gallery-widget.js'></script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type='text/javascript'>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,7 +635,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-wp-media-widget-image-preview">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.error && 'missing_attachment' === data.error ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error notice-alt notice-missing-attachment">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>We cannot find that image. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it was not deleted.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>That image can not be found. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it was not deleted.</p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.error ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error notice-alt">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,11 +676,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-wp-media-widget-video-preview">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.error && 'missing_attachment' === data.error ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error notice-alt notice-missing-attachment">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>We cannot find that video. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it was not deleted.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>That video can not be found. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it was not deleted.</p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.error && 'unsupported_file_type' === data.error ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error notice-alt notice-missing-attachment">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>Sorry, we cannot load the video at the supplied URL. Please check that the URL is for a supported video file (<code>.mp4</code>, <code>.m4v</code>, <code>.webm</code>, <code>.ogv</code>, <code>.flv</code>) or stream (e.g. YouTube and Vimeo).</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>Sorry, the video at the supplied URL can not be loaded. Please check that the URL is for a supported video file (<code>.mp4</code>, <code>.m4v</code>, <code>.webm</code>, <code>.ogv</code>, <code>.flv</code>) or stream (e.g. YouTube and Vimeo).</p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.error ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error notice-alt">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,7 +804,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-wp-media-widget-audio-preview">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.error && 'missing_attachment' === data.error ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error notice-alt notice-missing-attachment">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>We cannot find that audio file. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it was not deleted.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>That audio file can not be found. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it was not deleted.</p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.error ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error notice-alt">
</span></span></pre>
</div>
</div>
</body>
</html>