WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 #30883.
Built from https://develop.svn.wordpress.org/trunk@31979


git-svn-id: http://core.svn.wordpress.org/trunk@31958 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-04-02 01:05:27 +00:00
parent 3167253b70
commit 5f4e2cdba3
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
wp-includes/post-template.php
View File

@ -471,11 +471,16 @@ function get_post_class( $class = '', $post_id = null ) {
continue; continue;
} }
$term_class = sanitize_html_class( $term->slug, $term->term_id );
if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
$term_class = $term->term_id;
}
// 'post_tag' uses the 'tag' prefix for backward compatibility. // 'post_tag' uses the 'tag' prefix for backward compatibility.
if ( 'post_tag' == $taxonomy ) { if ( 'post_tag' == $taxonomy ) {
$classes[] = 'tag-' . sanitize_html_class( $term->slug, $term->term_id ); $classes[] = 'tag-' . $term_class;
} else { } else {
$classes[] = sanitize_html_class( $taxonomy . '-' . $term->slug, $taxonomy . '-' . $term->term_id ); $classes[] = sanitize_html_class( $taxonomy . '-' . $term_class, $taxonomy . '-' . $term->term_id );
} }
} }
} }
@ -588,21 +593,36 @@ function get_body_class( $class = '' ) {
$cat = $wp_query->get_queried_object(); $cat = $wp_query->get_queried_object();
$classes[] = 'category'; $classes[] = 'category';
if ( isset( $cat->term_id ) ) { if ( isset( $cat->term_id ) ) {
$classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->term_id ); $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;
$classes[] = 'category-' . $cat->term_id; $classes[] = 'category-' . $cat->term_id;
} }
} elseif ( is_tag() ) { } elseif ( is_tag() ) {
$tags = $wp_query->get_queried_object(); $tag = $wp_query->get_queried_object();
$classes[] = 'tag'; $classes[] = 'tag';
if ( isset( $tags->term_id ) ) { if ( isset( $tag->term_id ) ) {
$classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id ); $tag_class = sanitize_html_class( $tag->slug, $tag->term_id );
$classes[] = 'tag-' . $tags->term_id; if ( is_numeric( $tag_class ) || ! trim( $tag_class, '-' ) ) {
$tag_class = $tag->term_id;
}
$classes[] = 'tag-' . $tag_class;
$classes[] = 'tag-' . $tag->term_id;
} }
} elseif ( is_tax() ) { } elseif ( is_tax() ) {
$term = $wp_query->get_queried_object(); $term = $wp_query->get_queried_object();
if ( isset( $term->term_id ) ) { if ( isset( $term->term_id ) ) {
$term_class = sanitize_html_class( $term->slug, $term->term_id );
if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
$term_class = $term->term_id;
}
$classes[] = 'tax-' . sanitize_html_class( $term->taxonomy ); $classes[] = 'tax-' . sanitize_html_class( $term->taxonomy );
$classes[] = 'term-' . sanitize_html_class( $term->slug, $term->term_id ); $classes[] = 'term-' . $term_class;
$classes[] = 'term-' . $term->term_id; $classes[] = 'term-' . $term->term_id;
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-beta3-31978'; $wp_version = '4.2-beta3-31979';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.