Ticket #39754: 39754.diff

src/wp-includes/post-formats.php

@@ -222 +222 @@
         if ( in_array( 'post_format', (array) $taxonomies ) ) {
                 if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) {
                         foreach ( $terms as $order => $name ) {
-                                $terms[$order] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
+                                if ( 0 === strpos( $name, 'post-format-' ) ) {
+                                        $string = get_post_format_string( str_replace( 'post-format-', '', $name ) );
+
+                                        if ( $string ) {
+                                                $terms[ $order ] = $string;
+                                        }
+                                }
                         }
                 } else {
                         foreach ( (array) $terms as $order => $term ) {

tests/phpunit/tests/post/formats.php

@@ -156 +156 @@
                 $content_link = get_url_in_content( get_post_field( 'post_content', $comm_post_id ) );
                 $this->assertEquals( false, $content_link );
         }
+
+        function test_post_format_get_terms_skips_non_format_names() {
+                $this->assertSame(
+                        array( 'Foo', 'post-format-foo', 'aside', 'Aside' ),
+                        _post_format_get_terms(
+                                array( 'Foo', 'post-format-foo', 'aside', 'post-format-aside' ),
+                                array( 'post_format', 'category' ),
+                                array( 'fields' => 'names' )
+                        )
+                );
+        }
 }