Changeset 24082

Timestamp:

04/25/2013 03:06:31 AM (13 years ago)

Author:

markjaquith

Message:

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

props SergeyBirkukov, wonderboymusic. fixes #24089.

Location:

trunk/wp-includes

Files:

• post-formats.php (modified) (2 diffs)
• theme.php (modified) (2 diffs)

trunk/wp-includes/post-formats.php

@@ -57 +57 @@
  */
 function set_post_format( $post, $format ) {
-        $post = get_post($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() ) ) )
+        $post = get_post( $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, get_post_format_slugs() ) )
                         $format = '';
                 else
@@ -70 +70 @@
         }
 
-        return wp_set_post_terms($post->ID, $format, 'post_format');
+        return wp_set_post_terms( $post->ID, $format, 'post_format' );
 }
 

trunk/wp-includes/theme.php

@@ -1262 +1262 @@
                 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;
@@ -1270 +1270 @@
                                 $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;