<!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>[48081] trunk/src/wp-includes/sitemaps: Coding Standards: Fix WPCS issues in `wp-includes/sitemaps/`.</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/48081">48081</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/48081","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-18 14:43:31 +0000 (Thu, 18 Jun 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Fix WPCS issues in `wp-includes/sitemaps/`.
Some of these were not caught when running `composer lint:errors`, but are fixed when running `phpcbf` directly.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/48072">[48072]</a>, <a href="https://core.trac.wordpress.org/changeset/48080">[48080]</a>.
See <a href="https://core.trac.wordpress.org/ticket/49542">#49542</a>, <a href="https://core.trac.wordpress.org/ticket/50117">#50117</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludessitemapsclasswpsitemapsrendererphp">trunk/src/wp-includes/sitemaps/class-wp-sitemaps-renderer.php</a></li>
<li><a href="#trunksrcwpincludessitemapsclasswpsitemapsstylesheetphp">trunk/src/wp-includes/sitemaps/class-wp-sitemaps-stylesheet.php</a></li>
<li><a href="#trunksrcwpincludessitemapsclasswpsitemapsphp">trunk/src/wp-includes/sitemaps/class-wp-sitemaps.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludessitemapsclasswpsitemapsrendererphp"></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/sitemaps/class-wp-sitemaps-renderer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sitemaps/class-wp-sitemaps-renderer.php 2020-06-18 14:42:36 UTC (rev 48080)
+++ trunk/src/wp-includes/sitemaps/class-wp-sitemaps-renderer.php 2020-06-18 14:43:31 UTC (rev 48081)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,10 +40,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheet_url = $this->get_sitemap_stylesheet_url();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $stylesheet_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->stylesheet = '<?xml-stylesheet type="text/xsl" href="' . esc_url( $stylesheet_url ) . '" ?>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stylesheet_index_url = $this->get_sitemap_index_stylesheet_url();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $stylesheet_index_url = $this->get_sitemap_index_stylesheet_url();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $stylesheet_index_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->stylesheet_index = '<?xml-stylesheet type="text/xsl" href="' . esc_url( $stylesheet_index_url ) . '" ?>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,8 +163,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> __METHOD__,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: list of element names */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: List of element names. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Fields other than %s are not currently supported for the sitemap index.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> implode( ',', array( 'loc', 'lastmod' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,8 +228,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> __METHOD__,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: list of element names */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: List of element names. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Fields other than %s are not currently supported for sitemaps.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> implode( ',', array( 'loc', 'lastmod', 'changefreq', 'priority' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunksrcwpincludessitemapsclasswpsitemapsstylesheetphp"></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/sitemaps/class-wp-sitemaps-stylesheet.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sitemaps/class-wp-sitemaps-stylesheet.php 2020-06-18 14:42:36 UTC (rev 48080)
+++ trunk/src/wp-includes/sitemaps/class-wp-sitemaps-stylesheet.php 2020-06-18 14:43:31 UTC (rev 48081)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of URLs. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Number of URLs. */
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_xml( __( 'Number of URLs in this XML Sitemap: %s.' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<xsl:value-of select="count( sitemap:urlset/sitemap:url )" />'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,10 +152,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_sitemap_index_stylesheet() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $css = $this->get_stylesheet_css();
- $title = esc_xml( __( 'XML Sitemap' ) );
- $description = esc_xml( __( 'This XML Sitemap is generated by WordPress to make your content more visible for search engines.' ) );
- $learn_more = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $css = $this->get_stylesheet_css();
+ $title = esc_xml( __( 'XML Sitemap' ) );
+ $description = esc_xml( __( 'This XML Sitemap is generated by WordPress to make your content more visible for search engines.' ) );
+ $learn_more = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( __( 'https://www.sitemaps.org/' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_xml( __( 'Learn more about XML sitemaps.' ) )
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of URLs. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Number of URLs. */
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_xml( __( 'Number of URLs in this XML Sitemap: %s.' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<xsl:value-of select="count( sitemap:sitemapindex/sitemap:sitemap )" />'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludessitemapsclasswpsitemapsphp"></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/sitemaps/class-wp-sitemaps.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sitemaps/class-wp-sitemaps.php 2020-06-18 14:42:36 UTC (rev 48080)
+++ trunk/src/wp-includes/sitemaps/class-wp-sitemaps.php 2020-06-18 14:43:31 UTC (rev 48081)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,8 +207,9 @@
</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"> // 'pagename' is for most permalink types, name is for when the %postname% is used as a top-level field.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'sitemap-xml' === $query->get( 'pagename' ) ||
- 'sitemap-xml' === $query->get( 'name' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'sitemap-xml' === $query->get( 'pagename' )
+ || 'sitemap-xml' === $query->get( 'name' )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( $this->index->get_index_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>