diff --git wp-includes/post-formats.php wp-includes/post-formats.php
index f513210..887bb96 100644
|
|
function has_post_format( $format, $post = null ) { |
56 | 56 | * @return mixed WP_Error on error. Array of affected term IDs on success. |
57 | 57 | */ |
58 | 58 | function set_post_format( $post, $format ) { |
59 | | $post = get_post($post); |
| 59 | $post = get_post( $post ); |
60 | 60 | |
61 | | if ( empty($post) ) |
62 | | return new WP_Error('invalid_post', __('Invalid post')); |
| 61 | if ( empty( $post ) ) |
| 62 | return new WP_Error( 'invalid_post', __( 'Invalid post' ) ); |
63 | 63 | |
64 | | if ( !empty($format) ) { |
65 | | $format = sanitize_key($format); |
66 | | if ( 'standard' == $format || !in_array( $format, array_keys( get_post_format_slugs() ) ) ) |
| 64 | if ( ! empty( $format ) ) { |
| 65 | $format = sanitize_key( $format ); |
| 66 | if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) ) |
67 | 67 | $format = ''; |
68 | 68 | else |
69 | 69 | $format = 'post-format-' . $format; |
70 | 70 | } |
71 | 71 | |
72 | | return wp_set_post_terms($post->ID, $format, 'post_format'); |
| 72 | return wp_set_post_terms( $post->ID, $format, 'post_format' ); |
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
diff --git wp-includes/theme.php wp-includes/theme.php
index 2150b46..36f01b3 100644
|
|
function add_theme_support( $feature ) { |
1261 | 1261 | switch ( $feature ) { |
1262 | 1262 | case 'structured-post-formats' : |
1263 | 1263 | if ( is_array( $args[0] ) ) |
1264 | | $args[0] = array_intersect( $args[0], array_keys( get_post_format_slugs() ) ); |
| 1264 | $args[0] = array_intersect( $args[0], get_post_format_slugs() ); |
1265 | 1265 | // structured-post-formats support automatically adds support for post-formats. |
1266 | 1266 | $_wp_theme_features['post-formats'] = $args; |
1267 | 1267 | case 'post-formats' : |
… |
… |
function add_theme_support( $feature ) { |
1269 | 1269 | if ( current_theme_supports( 'structured-post-formats' ) ) |
1270 | 1270 | $args = get_theme_support( 'structured-post-formats' ); |
1271 | 1271 | elseif ( is_array( $args[0] ) ) |
1272 | | $args[0] = array_intersect( $args[0], array_keys( get_post_format_slugs() ) ); |
| 1272 | $args[0] = array_intersect( $args[0], get_post_format_slugs() ); |
1273 | 1273 | break; |
1274 | 1274 | |
1275 | 1275 | case 'custom-header-uploads' : |