<!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>[56174] trunk/src/wp-admin/includes: Docs: Replace multiple single line comments with multi-line 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/56174">56174</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/56174","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>2023-07-09 19:50:52 +0000 (Sun, 09 Jul 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Docs: Replace multiple single line comments with multi-line comments.
This changeset updates various comments as per WordPress PHP Inline Documentation Standards.
See https://developer.wordpress.org/coding-standards/inline-documentation-standards/php/<a href="https://core.trac.wordpress.org/ticket/5">#5</a>-inline-comments.
Props costdev, audrasjb.
See <a href="https://core.trac.wordpress.org/ticket/58459">#58459</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscoreupgraderphp">trunk/src/wp-admin/includes/class-core-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasspluginupgraderphp">trunk/src/wp-admin/includes/class-plugin-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeupgraderphp">trunk/src/wp-admin/includes/class-theme-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpdebugdataphp">trunk/src/wp-admin/includes/class-wp-debug-data.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystembasephp">trunk/src/wp-admin/includes/class-wp-filesystem-base.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpprivacypolicycontentphp">trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,8 +298,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $return = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check the type of request.
- // Current allowed values are `add` and `search`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Check the type of request.
+ * Current allowed values are `add` and `search`.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['autocomplete_type'] ) && 'search' === $_REQUEST['autocomplete_type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = $_REQUEST['autocomplete_type'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,8 +308,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'add';
</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">- // Check the desired field for value.
- // Current allowed values are `user_email` and `user_login`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Check the desired field for value.
+ * Current allowed values are `user_email` and `user_login`.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['autocomplete_field'] ) && 'user_email' === $_REQUEST['autocomplete_field'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $field = $_REQUEST['autocomplete_field'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1520,8 +1524,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // For performance reasons, we omit some object properties from the checklist.
- // The following is a hacky way to restore them when adding non-custom items.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * For performance reasons, we omit some object properties from the checklist.
+ * The following is a hacky way to restore them when adding non-custom items.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_items_data = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['menu-item'] as $menu_item_data ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2512,14 +2518,18 @@
</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">- // Set a custom header with the attachment_id.
- // Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Set a custom header with the attachment_id.
+ * Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! headers_sent() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'X-WP-Upload-Attachment-ID: ' . $attachment_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">- // This can still be pretty slow and cause timeout or out of memory errors.
- // The js that handles the response would need to also handle HTTP 500 errors.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * This can still be pretty slow and cause timeout or out of memory errors.
+ * The js that handles the response would need to also handle HTTP 500 errors.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_image_subsizes( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['_legacy_support'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3769,8 +3779,10 @@
</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 ( is_ssl() && str_starts_with( $url, 'http://' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Admin is ssl and the user pasted non-ssl URL.
- // Check if the provider supports ssl embeds and use that for the preview.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Admin is ssl and the user pasted non-ssl URL.
+ * Check if the provider supports ssl embeds and use that for the preview.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $ssl_shortcode = preg_replace( '%^(\\[embed[^\\]]*\\])http://%i', '$1https://', $shortcode );
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = $wp_embed->run_shortcode( $ssl_shortcode );
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-core-upgrader.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,8 +123,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $download = $this->download_package( $current->packages->$to_download, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Allow for signature soft-fail.
- // WARNING: This may be removed in the future.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Allow for signature soft-fail.
+ * WARNING: This may be removed in the future.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $download ) && $download->get_error_data( 'softfail-filename' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Output the failure error as a normal feedback, and not as an error:
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/update-core.php */
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasspluginupgraderphp"></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-plugin-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-plugin-upgrader.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-plugin-upgrader.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,8 +212,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'upgrader_pre_install', array( $this, 'active_before' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'upgrader_post_install', array( $this, 'active_after' ), 10, 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // There's a Trac ticket to move up the directory for zips which are made a bit differently, useful for non-.org plugins.
- // 'source_selection' => array( $this, 'source_selection' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * There's a Trac ticket to move up the directory for zips which are made a bit differently, useful for non-.org plugins.
+ * 'source_selection' => array( $this, 'source_selection' ),
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['clear_update_cache'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear cache so wp_update_plugins() knows about the new plugin.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,8 +254,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Force refresh of plugin update information.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Ensure any future auto-update failures trigger a failure email by removing
- // the last failure notification from the list when plugins update successfully.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Ensure any future auto-update failures trigger a failure email by removing
+ * the last failure notification from the list when plugins update successfully.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $past_failure_emails[ $plugin ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,8 +393,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup our hooks, in case something else does an upgrade on this connection.
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Ensure any future auto-update failures trigger a failure email by removing
- // the last failure notification from the list when plugins update successfully.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Ensure any future auto-update failures trigger a failure email by removing
+ * the last failure notification from the list when plugins update successfully.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results as $plugin => $result ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,8 +657,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $removed;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If plugin is in its own directory, recursively delete the directory.
- // Base check on if plugin includes directory separator AND that it's not the root plugin folder.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If plugin is in its own directory, recursively delete the directory.
+ * Base check on if plugin includes directory separator AND that it's not the root plugin folder.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $plugin, '/' ) && $this_plugin_dir !== $plugins_dir ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted = $wp_filesystem->delete( $this_plugin_dir, true );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeupgraderphp"></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-theme-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-upgrader.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-theme-upgrader.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,8 +351,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Ensure any future auto-update failures trigger a failure email by removing
- // the last failure notification from the list when themes update successfully.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Ensure any future auto-update failures trigger a failure email by removing
+ * the last failure notification from the list when themes update successfully.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $past_failure_emails[ $theme ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,8 +494,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'upgrader_post_install', array( $this, 'current_after' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Ensure any future auto-update failures trigger a failure email by removing
- // the last failure notification from the list when themes update successfully.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Ensure any future auto-update failures trigger a failure email by removing
+ * the last failure notification from the list when themes update successfully.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results as $theme => $result ) {
</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 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,8 +470,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && ( 'up_to_date' === $upgrade_result->get_error_code()
</span><span class="cx" style="display: block; padding: 0 10px"> || 'locked' === $upgrade_result->get_error_code() )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // These aren't actual errors, treat it as a skipped-update instead
- // to avoid triggering the post-core update failure routines.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * These aren't actual errors, treat it as a skipped-update instead
+ * to avoid triggering the post-core update failure routines.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">@@ -548,8 +550,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update( 'core', $core_update );
</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">- // Clean up, and check for any pending translations.
- // (Core_Upgrader checks for core updates.)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Clean up, and check for any pending translations.
+ * (Core_Upgrader checks for core updates.)
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_stats = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->update_results['theme'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->update_results['theme'] as $upgrade ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,8 +642,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $error_code = $result->get_error_code();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Any of these WP_Error codes are critical failures, as in they occurred after we started to copy core files.
- // We should not try to perform a background update again until there is a successful one-click update performed by the user.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Any of these WP_Error codes are critical failures, as in they occurred after we started to copy core files.
+ * We should not try to perform a background update again until there is a successful one-click update performed by the user.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $critical = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'disk_full' === $error_code || str_contains( $error_code, '__copy_dir' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $critical = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -831,8 +837,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Don't show this message if there is a newer version available.
- // Potential for confusion, and also not useful for them to know at this point.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Don't show this message if there is a newer version available.
+ * Potential for confusion, and also not useful for them to know at this point.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'fail' === $type && ! $newer_version_available ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= __( 'An attempt was made, but your site could not be updated automatically.' ) . ' ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,8 +911,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= ' ' . __( 'Some data that describes the error your site encountered has been put together.' );
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If we had a rollback and we're still critical, then the rollback failed too.
- // Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If we had a rollback and we're still critical, then the rollback failed too.
+ * Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'rollback_was_required' === $result->get_error_code() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpdebugdataphp"></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-debug-data.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-debug-data.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-wp-debug-data.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1619,20 +1619,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $max_execution_time = ini_get( 'max_execution_time' );
</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">- // The max_execution_time defaults to 0 when PHP runs from cli.
- // We still want to limit it below.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * The max_execution_time defaults to 0 when PHP runs from cli.
+ * We still want to limit it below.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $max_execution_time ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_execution_time = 30; // 30 seconds.
</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 ( $max_execution_time > 20 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the max_execution_time is set to lower than 20 seconds, reduce it a bit to prevent
- // edge-case timeouts that may happen after the size loop has finished running.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the max_execution_time is set to lower than 20 seconds, reduce it a bit to prevent
+ * edge-case timeouts that may happen after the size loop has finished running.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $max_execution_time -= 2;
</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">- // Go through the various installation directories and calculate their sizes.
- // No trailing slashes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Go through the various installation directories and calculate their sizes.
+ * No trailing slashes.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $paths = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordpress_size' => untrailingslashit( ABSPATH ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'themes_size' => get_theme_root(),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystembasephp"></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-filesystem-base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,8 +57,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function abspath() {
</span><span class="cx" style="display: block; padding: 0 10px"> $folder = $this->find_folder( ABSPATH );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Perhaps the FTP folder is rooted at the WordPress install.
- // Check for wp-includes folder in root. Could have some false positives, but rare.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Perhaps the FTP folder is rooted at the WordPress install.
+ * Check for wp-includes folder in root. Could have some false positives, but rare.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $folder && $this->is_dir( '/' . WPINC ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $folder = '/';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,8 +307,10 @@
</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">- // Only check this as a last resort, to prevent locating the incorrect install.
- // All above procedures will fail quickly if this is the right branch to take.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Only check this as a last resort, to prevent locating the incorrect install.
+ * All above procedures will fail quickly if this is the right branch to take.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $files[ $last_path ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->verbose ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Directory name. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,14 +320,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return trailingslashit( $base . $last_path );
</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">- // Prevent this function from looping again.
- // No need to proceed if we've just searched in `/`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Prevent this function from looping again.
+ * No need to proceed if we've just searched in `/`.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $loop || '/' === $base ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- // As an extra last resort, Change back to / if the folder wasn't found.
- // This comes into effect when the CWD is /home/user/ but WP is at /var/www/....
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * As an extra last resort, Change back to / if the folder wasn't found.
+ * This comes into effect when the CWD is /home/user/ but WP is at /var/www/....
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->search_for_folder( $folder, '/', true );
</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="trunksrcwpadminincludesclasswplisttablephp"></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-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-list-table.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1142,8 +1142,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $column;
</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">- // We need a primary defined so responsive views show something,
- // so let's fall back to the first non-checkbox column.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * We need a primary defined so responsive views show something,
+ * so let's fall back to the first non-checkbox column.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $columns as $col => $column_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'cb' === $col ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1180,8 +1182,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $columns = get_column_headers( $this->screen );
</span><span class="cx" style="display: block; padding: 0 10px"> $default = $this->get_default_primary_column_name();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the primary column doesn't exist,
- // fall back to the first non-checkbox column.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the primary column doesn't exist,
+ * fall back to the first non-checkbox column.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $columns[ $default ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $default = self::get_default_primary_column_name();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1666,8 +1670,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $classes .= ' hidden';
</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">- // Comments column uses HTML in the display name with screen reader text.
- // Strip tags to get closer to a user-friendly string.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Comments column uses HTML in the display name with screen reader text.
+ * Strip tags to get closer to a user-friendly string.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = 'data-colname="' . esc_attr( wp_strip_all_tags( $column_display_name ) ) . '"';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes = "class='$classes' $data";
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></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-plugin-install-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-plugin-install-list-table.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,8 +115,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs['favorites'] = _x( 'Favorites', 'Plugin Installer' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'upload_plugins' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // No longer a real tab. Here for filter compatibility.
- // Gets skipped in get_views().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * No longer a real tab. Here for filter compatibility.
+ * Gets skipped in get_views().
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $tabs['upload'] = __( 'Upload Plugin' );
</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="trunksrcwpadminincludesclasswppluginslisttablephp"></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-plugins-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-plugins-list-table.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,8 +261,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ( ! $screen->in_admin( 'network' ) && is_plugin_active( $plugin_file ) )
</span><span class="cx" style="display: block; padding: 0 10px"> || ( $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // On the non-network screen, populate the active list with plugins that are individually activated.
- // On the network admin screen, populate the active list with plugins that are network-activated.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * On the non-network screen, populate the active list with plugins that are individually activated.
+ * On the network admin screen, populate the active list with plugins that are network-activated.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugins['active'][ $plugin_file ] = $plugin_data;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $screen->in_admin( 'network' ) && is_plugin_paused( $plugin_file ) ) {
</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 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,11 +103,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sort( $old );
</span><span class="cx" style="display: block; padding: 0 10px"> sort( $new );
</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 == operator (equal, not identical) was used intentionally.
- // See https://www.php.net/manual/en/language.operators.array.php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * The == operator (equal, not identical) was used intentionally.
+ * See https://www.php.net/manual/en/language.operators.array.php
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $new != $old ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // A plugin was activated or deactivated, or some policy text has changed.
- // Show a notice on the relevant screens to inform the admin.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * A plugin was activated or deactivated, or some policy text has changed.
+ * Show a notice on the relevant screens to inform the admin.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_notices', array( 'WP_Privacy_Policy_Content', 'policy_text_changed_notice' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $state = 'changed';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsitehealthphp"></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-site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -772,8 +772,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $result;
</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">- // The PHP version is still receiving security fixes, but is lower than
- // the expected minimum version that will be required by WordPress in the near future.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * The PHP version is still receiving security fixes, but is lower than
+ * the expected minimum version that will be required by WordPress in the near future.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $response['is_secure'] && $response['is_lower_than_future_minimum'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // The `is_secure` array key name doesn't actually imply this is a secure version of PHP. It only means it receives security updates.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1557,8 +1559,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The test results.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_test_https_status() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Enforce fresh HTTPS detection results. This is normally invoked by using cron,
- // but for Site Health it should always rely on the latest results.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Enforce fresh HTTPS detection results. This is normally invoked by using cron,
+ * but for Site Health it should always rely on the latest results.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_https_detection_errors();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $default_update_url = wp_get_default_update_https_url();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1585,8 +1589,10 @@
</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 ( ! wp_is_using_https() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the website is not using HTTPS, provide more information
- // about whether it is supported and how it can be enabled.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the website is not using HTTPS, provide more information
+ * about whether it is supported and how it can be enabled.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $result['status'] = 'recommended';
</span><span class="cx" style="display: block; padding: 0 10px"> $result['label'] = __( 'Your website does not use HTTPS' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1840,8 +1846,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/class-wp-site-health-auto-updates.php';
</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">- // Run the auto-update tests in a separate class,
- // as there are many considerations to be made.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Run the auto-update tests in a separate class,
+ * as there are many considerations to be made.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $automatic_updates = new WP_Site_Health_Auto_Updates();
</span><span class="cx" style="display: block; padding: 0 10px"> $tests = $automatic_updates->run_tests();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3378,9 +3386,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Include basic auth in loopback requests. Note that this will only pass along basic auth when user is
- // initiating the test. If a site requires basic auth, the test will fail when it runs in WP Cron as part of
- // wp_site_health_scheduled_check. This logic is copied from WP_Site_Health::can_perform_loopback().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Include basic auth in loopback requests. Note that this will only pass along basic auth when user is
+ * initiating the test. If a site requires basic auth, the test will fail when it runs in WP Cron as part of
+ * wp_site_health_scheduled_check. This logic is copied from WP_Site_Health::can_perform_loopback().
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_SERVER['PHP_AUTH_USER'] ) && isset( $_SERVER['PHP_AUTH_PW'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $headers['Authorization'] = 'Basic ' . base64_encode( wp_unslash( $_SERVER['PHP_AUTH_USER'] ) . ':' . wp_unslash( $_SERVER['PHP_AUTH_PW'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -563,8 +563,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // There are no files?
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'incompatible_archive_empty', $this->strings['incompatible_archive'], $this->strings['no_files'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // It's only a single file, the upgrader will use the folder name of this file as the destination folder.
- // Folder name is based on zip filename.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * It's only a single file, the upgrader will use the folder name of this file as the destination folder.
+ * Folder name is based on zip filename.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $source = trailingslashit( $args['source'] );
</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">@@ -641,8 +643,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $removed;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $args['abort_if_destination_exists'] && $wp_filesystem->exists( $remote_destination ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If we're not clearing the destination folder and something exists there already, bail.
- // But first check to see if there are actually any files in the folder.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If we're not clearing the destination folder and something exists there already, bail.
+ * But first check to see if there are actually any files in the folder.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $_files = $wp_filesystem->dirlist( $remote_destination );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_files ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->delete( $remote_source, true ); // Clear out the source files.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,8 +825,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $download = $this->download_package( $options['package'], true, $options['hook_extra'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Allow for signature soft-fail.
- // WARNING: This may be removed in the future.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Allow for signature soft-fail.
+ * WARNING: This may be removed in the future.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $download ) && $download->get_error_data( 'softfail-filename' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't output the 'no signature could be found' failure message for now.
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></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/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/file.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,8 +574,10 @@
</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 ( function_exists( 'session_status' ) && PHP_SESSION_ACTIVE === session_status() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Close any active session to prevent HTTP requests from timing out
- // when attempting to connect back to the site.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Close any active session to prevent HTTP requests from timing out
+ * when attempting to connect back to the site.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> session_write_close();
</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">@@ -1251,8 +1253,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $signature = wp_remote_retrieve_header( $response, 'X-Content-Signature' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $signature ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Retrieve signatures from a file if the header wasn't included.
- // WordPress.org stores signatures at $package_url.sig.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Retrieve signatures from a file if the header wasn't included.
+ * WordPress.org stores signatures at $package_url.sig.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $signature_url = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1386,8 +1390,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> in_array( PHP_VERSION_ID, array( 70200, 70201, 70202 ), true ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> extension_loaded( 'opcache' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Sodium_Compat isn't compatible with PHP 7.2.0~7.2.2 due to a bug in the PHP Opcache extension, bail early as it'll fail.
- // https://bugs.php.net/bug.php?id=75938
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Sodium_Compat isn't compatible with PHP 7.2.0~7.2.2 due to a bug in the PHP Opcache extension, bail early as it'll fail.
+ * https://bugs.php.net/bug.php?id=75938
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'signature_verification_unsupported',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1420,8 +1426,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:enable
</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">- // This cannot be performed in a reasonable amount of time.
- // https://github.com/paragonie/sodium_compat#help-sodium_compat-is-slow-how-can-i-make-it-fast
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * This cannot be performed in a reasonable amount of time.
+ * https://github.com/paragonie/sodium_compat#help-sodium_compat-is-slow-how-can-i-make-it-fast
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $sodium_compat_is_fast ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'signature_verification_unsupported',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2327,8 +2335,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'private_key' => 'FTP_PRIKEY',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If defined, set it to that. Else, if POST'd, set it to that. If not, set it to an empty string.
- // Otherwise, keep it as it previously was (saved details in option).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If defined, set it to that. Else, if POST'd, set it to that. If not, set it to an empty string.
+ * Otherwise, keep it as it previously was (saved details in option).
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $ftp_constants as $key => $constant ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( $constant ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $credentials[ $key ] = constant( $constant );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2531,8 +2541,10 @@
</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">- // Make sure the `submit_button()` function is available during the REST API call
- // from WP_Site_Health_Auto_Updates::test_check_wp_filesystem_method().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Make sure the `submit_button()` function is available during the REST API call
+ * from WP_Site_Health_Auto_Updates::test_check_wp_filesystem_method().
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'submit_button' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/template.php';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesimagephp"></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/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/image.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,8 +28,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $src_file = get_attached_file( $src );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( $src_file ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the file doesn't exist, attempt a URL fopen on the src link.
- // This can occur with certain file replication plugins.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the file doesn't exist, attempt a URL fopen on the src link.
+ * This can occur with certain file replication plugins.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $src = _load_image_to_edit_path( $src, 'full' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $src = $src_file;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,8 +161,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $image_file = wp_get_original_image_path( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $image_meta ) || ! is_array( $image_meta ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Previously failed upload?
- // If there is an uploaded file, make all sub-sizes and generate all of the attachment meta.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Previously failed upload?
+ * If there is an uploaded file, make all sub-sizes and generate all of the attachment meta.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $image_file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_create_image_subsizes( $image_file, $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,8 +287,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $threshold = (int) apply_filters( 'big_image_size_threshold', 2560, $imagesize, $file, $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the original image's dimensions are over the threshold,
- // scale the image and use it as the "full" size.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the original image's dimensions are over the threshold,
+ * scale the image and use it as the "full" size.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = wp_get_image_editor( $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,8 +310,10 @@
</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 ( ! is_wp_error( $resized ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg".
- // This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg".
+ * This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $saved = $editor->save( $editor->generate_filename( 'scaled' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $saved ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/media.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,14 +422,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = wp_insert_attachment( $attachment, $file, $post_id, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $attachment_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set a custom header with the attachment_id.
- // Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Set a custom header with the attachment_id.
+ * Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! headers_sent() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'X-WP-Upload-Attachment-ID: ' . $attachment_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">- // The image sub-sizes are created during wp_generate_attachment_metadata().
- // This is generally slow and may cause timeouts or out of memory errors.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * The image sub-sizes are created during wp_generate_attachment_metadata().
+ * This is generally slow and may cause timeouts or out of memory errors.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
</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="trunksrcwpadminincludesmetaboxesphp"></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/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2023-07-09 17:21:21 UTC (rev 56173)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2023-07-09 19:50:52 UTC (rev 56174)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1672,8 +1672,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action_deprecated( 'dbx_post_advanced', array( $post ), '3.7.0', 'add_meta_boxes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Allow the Discussion meta box to show up if the post type supports comments,
- // or if comments or pings are open.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Allow the Discussion meta box to show up if the post type supports comments,
+ * or if comments or pings are open.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( comments_open( $post ) || pings_open( $post ) || post_type_supports( $post_type, 'comments' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'commentstatusdiv', __( 'Discussion' ), 'post_comment_status_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1685,8 +1687,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $stati[] = 'private';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( get_post_status( $post ), $stati, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the post type support comments, or the post has comments,
- // allow the Comments meta box.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the post type support comments, or the post has comments,
+ * allow the Comments meta box.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( comments_open( $post ) || pings_open( $post ) || $post->comment_count > 0 || post_type_supports( $post_type, 'comments' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'commentsdiv', __( 'Comments' ), 'post_comment_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>