<!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>[31979] trunk: Avoid duplicate classes for different terms with UTF-8 slugs in `post_class()` and `body_class()`.</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 { 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/31979">31979</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/31979","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>2015-04-02 01:04:22 +0000 (Thu, 02 Apr 2015)</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'>Avoid duplicate classes for different terms with UTF-8 slugs in `post_class()` and `body_class()`.
Fall back to term ID if the sanitized slug is numeric or only contains hyphens.
props SergeyBiryukov, A5hleyRich, sgrant, davideugenepratt.
fixes <a href="https://core.trac.wordpress.org/ticket/30883">#30883</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesposttemplatephp">trunk/src/wp-includes/post-template.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPostClassphp">trunk/tests/phpunit/tests/post/getPostClass.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestspostgetBodyClassphp">trunk/tests/phpunit/tests/post/getBodyClass.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesposttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-template.php 2015-04-02 00:12:07 UTC (rev 31978)
+++ trunk/src/wp-includes/post-template.php 2015-04-02 01:04:22 UTC (rev 31979)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,11 +471,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_class = sanitize_html_class( $term->slug, $term->term_id );
+ if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
+ $term_class = $term->term_id;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // 'post_tag' uses the 'tag' prefix for backward compatibility.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'post_tag' == $taxonomy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes[] = 'tag-' . sanitize_html_class( $term->slug, $term->term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes[] = 'tag-' . $term_class;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes[] = sanitize_html_class( $taxonomy . '-' . $term->slug, $taxonomy . '-' . $term->term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes[] = sanitize_html_class( $taxonomy . '-' . $term_class, $taxonomy . '-' . $term->term_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -588,21 +593,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cat = $wp_query->get_queried_object();
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'category';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $cat->term_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cat_class = sanitize_html_class( $cat->slug, $cat->term_id );
+ if ( is_numeric( $cat_class ) || ! trim( $cat_class, '-' ) ) {
+ $cat_class = $cat->term_id;
+ }
+
+ $classes[] = 'category-' . $cat_class;
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'category-' . $cat->term_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_tag() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tags = $wp_query->get_queried_object();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = $wp_query->get_queried_object();
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'tag';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $tags->term_id ) ) {
- $classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id );
- $classes[] = 'tag-' . $tags->term_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $tag->term_id ) ) {
+ $tag_class = sanitize_html_class( $tag->slug, $tag->term_id );
+ if ( is_numeric( $tag_class ) || ! trim( $tag_class, '-' ) ) {
+ $tag_class = $tag->term_id;
+ }
+
+ $classes[] = 'tag-' . $tag_class;
+ $classes[] = 'tag-' . $tag->term_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_tax() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = $wp_query->get_queried_object();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $term->term_id ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_class = sanitize_html_class( $term->slug, $term->term_id );
+ if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
+ $term_class = $term->term_id;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'tax-' . sanitize_html_class( $term->taxonomy );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes[] = 'term-' . sanitize_html_class( $term->slug, $term->term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes[] = 'term-' . $term_class;
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'term-' . $term->term_id;
</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="trunktestsphpunittestspostgetBodyClassphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/post/getBodyClass.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getBodyClass.php (rev 0)
+++ trunk/tests/phpunit/tests/post/getBodyClass.php 2015-04-02 01:04:22 UTC (rev 31979)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,81 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group post
+ * @covers ::get_body_class
+ */
+class Tests_Post_GetBodyClass extends WP_UnitTestCase {
+ protected $post_id;
+
+ public function setUp() {
+ parent::setUp();
+ $this->post_id = $this->factory->post->create();
+ }
+
+ /**
+ * @ticket 30883
+ */
+ public function test_with_utf8_category_slugs() {
+ $cat_id1 = $this->factory->category->create( array( 'name' => 'Первая рубрика' ) );
+ $cat_id2 = $this->factory->category->create( array( 'name' => 'Вторая рубрика' ) );
+ $cat_id3 = $this->factory->category->create( array( 'name' => '25кадр' ) );
+ wp_set_post_terms( $this->post_id, array( $cat_id1, $cat_id2, $cat_id3 ), 'category' );
+
+ $this->go_to( home_url( "?cat=$cat_id1" ) );
+ $this->assertContains( "category-$cat_id1", get_body_class() );
+
+ $this->go_to( home_url( "?cat=$cat_id2" ) );
+ $this->assertContains( "category-$cat_id2", get_body_class() );
+
+ $this->go_to( home_url( "?cat=$cat_id3" ) );
+ $this->assertContains( "category-$cat_id3", get_body_class() );
+ }
+
+ /**
+ * @ticket 30883
+ */
+ public function test_with_utf8_tag_slugs() {
+ $tag_id1 = $this->factory->tag->create( array( 'name' => 'Первая метка' ) );
+ $tag_id2 = $this->factory->tag->create( array( 'name' => 'Вторая метка' ) );
+ $tag_id3 = $this->factory->tag->create( array( 'name' => '25кадр' ) );
+ wp_set_post_terms( $this->post_id, array( $tag_id1, $tag_id2, $tag_id3 ), 'post_tag' );
+
+ $tag1 = get_term( $tag_id1, 'post_tag' );
+ $tag2 = get_term( $tag_id2, 'post_tag' );
+ $tag3 = get_term( $tag_id3, 'post_tag' );
+
+ $this->go_to( home_url( "?tag={$tag1->slug}" ) );
+ $this->assertContains( "tag-$tag_id1", get_body_class() );
+
+ $this->go_to( home_url( "?tag={$tag2->slug}" ) );
+ $this->assertContains( "tag-$tag_id2", get_body_class() );
+
+ $this->go_to( home_url( "?tag={$tag3->slug}" ) );
+ $this->assertContains( "tag-$tag_id3", get_body_class() );
+ }
+
+ /**
+ * @ticket 30883
+ */
+ public function test_with_utf8_term_slugs() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ $term_id1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Первая метка' ) );
+ $term_id2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Вторая метка' ) );
+ $term_id3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => '25кадр' ) );
+ wp_set_post_terms( $this->post_id, array( $term_id1, $term_id2, $term_id3 ), 'wptests_tax' );
+
+ $term1 = get_term( $term_id1, 'wptests_tax' );
+ $term2 = get_term( $term_id2, 'wptests_tax' );
+ $term3 = get_term( $term_id3, 'wptests_tax' );
+
+ $this->go_to( home_url( "?wptests_tax={$term1->slug}" ) );
+ $this->assertContains( "term-$term_id1", get_body_class() );
+
+ $this->go_to( home_url( "?wptests_tax={$term2->slug}" ) );
+ $this->assertContains( "term-$term_id2", get_body_class() );
+
+ $this->go_to( home_url( "?wptests_tax={$term3->slug}" ) );
+ $this->assertContains( "term-$term_id3", get_body_class() );
+ }
+
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestspostgetPostClassphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/getPostClass.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPostClass.php 2015-04-02 00:12:07 UTC (rev 31978)
+++ trunk/tests/phpunit/tests/post/getPostClass.php 2015-04-02 01:04:22 UTC (rev 31979)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,6 +54,55 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 30883
+ */
+ public function test_with_utf8_category_slugs() {
+ $cat_id1 = $this->factory->category->create( array( 'name' => 'Первая рубрика' ) );
+ $cat_id2 = $this->factory->category->create( array( 'name' => 'Вторая рубрика' ) );
+ $cat_id3 = $this->factory->category->create( array( 'name' => '25кадр' ) );
+ wp_set_post_terms( $this->post_id, array( $cat_id1, $cat_id2, $cat_id3 ), 'category' );
+
+ $found = get_post_class( '', $this->post_id );
+
+ $this->assertContains( "category-$cat_id1", $found );
+ $this->assertContains( "category-$cat_id2", $found );
+ $this->assertContains( "category-$cat_id3", $found );
+ }
+
+ /**
+ * @ticket 30883
+ */
+ public function test_with_utf8_tag_slugs() {
+ $tag_id1 = $this->factory->tag->create( array( 'name' => 'Первая метка' ) );
+ $tag_id2 = $this->factory->tag->create( array( 'name' => 'Вторая метка' ) );
+ $tag_id3 = $this->factory->tag->create( array( 'name' => '25кадр' ) );
+ wp_set_post_terms( $this->post_id, array( $tag_id1, $tag_id2, $tag_id3 ), 'post_tag' );
+
+ $found = get_post_class( '', $this->post_id );
+
+ $this->assertContains( "tag-$tag_id1", $found );
+ $this->assertContains( "tag-$tag_id2", $found );
+ $this->assertContains( "tag-$tag_id3", $found );
+ }
+
+ /**
+ * @ticket 30883
+ */
+ public function test_with_utf8_term_slugs() {
+ register_taxonomy( 'wptests_tax', 'post' );
+ $term_id1 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Первая метка' ) );
+ $term_id2 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Вторая метка' ) );
+ $term_id3 = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => '25кадр' ) );
+ wp_set_post_terms( $this->post_id, array( $term_id1, $term_id2, $term_id3 ), 'wptests_tax' );
+
+ $found = get_post_class( '', $this->post_id );
+
+ $this->assertContains( "wptests_tax-$term_id1", $found );
+ $this->assertContains( "wptests_tax-$term_id2", $found );
+ $this->assertContains( "wptests_tax-$term_id3", $found );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group cache
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_taxonomy_classes_hit_cache() {
</span></span></pre>
</div>
</div>
</body>
</html>