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

Fix redundant use of array_keys() around get_post_format_slugs(). 

props SergeyBirkukov, wonderboymusic. fixes #24089.

git-svn-id: http://core.svn.wordpress.org/trunk@24082 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mark Jaquith 2013-04-25 03:06:31 +00:00
parent 90fc15e6d9
commit 759b3f5e82
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/post-formats.php
View File

@ -56,20 +56,20 @@ function has_post_format( $format, $post = null ) {
* @return mixed WP_Error on error. Array of affected term IDs on success.
*/
function set_post_format( $post, $format ) {
$post = get_post($post);
$post = get_post( $post );
if ( empty($post) )
return new WP_Error('invalid_post', __('Invalid post'));
if ( empty( $post ) )
return new WP_Error( 'invalid_post', __( 'Invalid post' ) );
if ( !empty($format) ) {
$format = sanitize_key($format);
if ( 'standard' == $format || !in_array( $format, array_keys( get_post_format_slugs() ) ) )
if ( ! empty( $format ) ) {
$format = sanitize_key( $format );
if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) )
$format = '';
else
$format = 'post-format-' . $format;
}
return wp_set_post_terms($post->ID, $format, 'post_format');
return wp_set_post_terms( $post->ID, $format, 'post_format' );
}
/**

4
wp-includes/theme.php
View File

@ -1261,7 +1261,7 @@ function add_theme_support( $feature ) {
switch ( $feature ) {
case 'structured-post-formats' :
if ( is_array( $args[0] ) )
$args[0] = array_intersect( $args[0], array_keys( get_post_format_slugs() ) );
$args[0] = array_intersect( $args[0], get_post_format_slugs() );
// structured-post-formats support automatically adds support for post-formats.
$_wp_theme_features['post-formats'] = $args;
case 'post-formats' :
@ -1269,7 +1269,7 @@ function add_theme_support( $feature ) {
if ( current_theme_supports( 'structured-post-formats' ) )
$args = get_theme_support( 'structured-post-formats' );
elseif ( is_array( $args[0] ) )
$args[0] = array_intersect( $args[0], array_keys( get_post_format_slugs() ) );
$args[0] = array_intersect( $args[0], get_post_format_slugs() );
break;
case 'custom-header-uploads' :