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

Always pass back the custom classes `get_post_class()` was called with, even if the post was not found. 

props F J Kaiser, Bueltge.
fixes #22271.
Built from https://develop.svn.wordpress.org/trunk@31408


git-svn-id: http://core.svn.wordpress.org/trunk@31389 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-02-11 04:00:26 +00:00
parent 3cd585a457
commit 97698eb127
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,8 +408,16 @@ function get_post_class( $class = '', $post_id = null ) {
$classes = array(); $classes = array();
if ( empty($post) ) if ( $class ) {
if ( ! is_array( $class ) ) {
$class = preg_split( '#\s+#', $class );
}
$classes = array_map( 'esc_attr', $class );
}
if ( ! $post ) {
return $classes; return $classes;
}
$classes[] = 'post-' . $post->ID; $classes[] = 'post-' . $post->ID;
if ( ! is_admin() ) if ( ! is_admin() )
@ -466,12 +474,6 @@ function get_post_class( $class = '', $post_id = null ) {
} }
} }
if ( !empty($class) ) {
if ( !is_array( $class ) )
$class = preg_split('#\s+#', $class);
$classes = array_merge($classes, $class);
}
$classes = array_map( 'esc_attr', $classes ); $classes = array_map( 'esc_attr', $classes );
/** /**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31407'; $wp_version = '4.2-alpha-31408';
/** /**
* 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.