<!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>[56117] trunk/src/wp-admin/includes: Site Health: Correct the label for `wp-content` directory check.</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/56117">56117</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/56117","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-30 11:11:13 +0000 (Fri, 30 Jun 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'>Site Health: Correct the label for `wp-content` directory check.
This removes HTML tags from the label, which were not displayed as expected due to escaping. Including the directory name in the label is also redundant, as it is already mentioned in the check result description directly below.
Includes:
* Adjusting a few other labels for consistency.
* Moving `wp-content` out of the translatable string in a similar message in `WP_Upgrader::generic_strings()`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/55720">[55720]</a>.
Props dlh, mukesh27, audrasjb, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/58678">#58678</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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-06-30 08:54:39 UTC (rev 56116)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2023-06-30 11:11:13 UTC (rev 56117)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2009,12 +2009,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_content = $wp_filesystem->wp_content_dir();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result['status'] = 'critical';
- $result['label'] = sprintf(
- /* translators: %s: wp-content */
- __( 'Unable to locate WordPress content directory (%s)' ),
- '<code>wp-content</code>'
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result['status'] = 'critical';
+ $result['label'] = __( 'Unable to locate WordPress content directory' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result['description'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: wp-content */
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'The %s directory cannot be located.' ) . '</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2079,12 +2075,8 @@
</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 ( ! $backup_dir_exists && $upgrade_dir_exists && ! $upgrade_dir_is_writable ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result['status'] = 'critical';
- $result['label'] = sprintf(
- /* translators: %s: upgrade */
- __( 'The %s directory exists but is not writable' ),
- 'upgrade'
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result['status'] = 'critical';
+ $result['label'] = __( 'The upgrade directory exists but is not writable' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result['description'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: wp-content/upgrade */
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'The %s directory exists but is not writable. This directory is used for plugin and theme updates. Please make sure the server has write permissions to this directory.' ) . '</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2094,12 +2086,8 @@
</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 ( ! $upgrade_dir_exists && ! $wp_filesystem->is_writable( $wp_content ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result['status'] = 'critical';
- $result['label'] = sprintf(
- /* translators: %s: upgrade */
- __( 'The %s directory cannot be created' ),
- 'upgrade'
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result['status'] = 'critical';
+ $result['label'] = __( 'The upgrade directory cannot be created' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result['description'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: wp-content/upgrade, 2: wp-content. */
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'The %1$s directory does not exist, and the server does not have write permissions in %2$s to create it. This directory is used for plugin and theme updates. Please make sure the server has write permissions in %2$s.' ) . '</p>',
</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-06-30 08:54:39 UTC (rev 56116)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2023-06-30 11:11:13 UTC (rev 56117)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['fs_unavailable'] = __( 'Could not access filesystem.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['fs_error'] = __( 'Filesystem error.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['fs_no_root_dir'] = __( 'Unable to locate WordPress root directory.' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->strings['fs_no_content_dir'] = __( 'Unable to locate WordPress content directory (wp-content).' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->strings['fs_no_content_dir'] = sprintf( __( 'Unable to locate WordPress content directory (%s).' ), 'wp-content' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->strings['fs_no_plugins_dir'] = __( 'Unable to locate WordPress plugin directory.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->strings['fs_no_themes_dir'] = __( 'Unable to locate WordPress theme directory.' );
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Directory name. */
</span></span></pre>
</div>
</div>
</body>
</html>