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

Don't display Standard post format twice in the meta box if the theme unnecessarily mentions it in the add_theme_support() call. 

props ptahdunbar, nacin, pushplaybang, obenland.
fixes #16555.
Built from https://develop.svn.wordpress.org/trunk@30038


git-svn-id: http://core.svn.wordpress.org/trunk@30038 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2014-10-27 11:26:18 +00:00
parent 9f379e6b6c
commit ed4a827365
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/theme.php
View File

@ -1472,8 +1472,12 @@ function add_theme_support( $feature ) {
switch ( $feature ) { switch ( $feature ) {
case 'post-formats' : case 'post-formats' :
if ( is_array( $args[0] ) ) if ( is_array( $args[0] ) ) {
$args[0] = array_intersect( $args[0], array_keys( get_post_format_slugs() ) ); $post_formats = get_post_format_slugs();
unset( $post_formats['standard'] );
$args[0] = array_intersect( $args[0], array_keys( $post_formats ) );
}
break; break;
case 'html5' : case 'html5' :

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-alpha-30037'; $wp_version = '4.1-alpha-30038';
/** /**
* 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.