Ticket #35194: 35194.2.diff

src/wp-includes/embed.php

@@ -345 +345 @@
 function wp_oembed_add_discovery_links() {
         $output = '';
 
-        if ( is_singular() ) {
+        if ( is_singular() && ! is_front_page() ) {
                 $output .= '<link rel="alternate" type="application/json+oembed" href="' . esc_url( get_oembed_endpoint_url( get_permalink() ) ) . '" />' . "\n";
 
                 if ( class_exists( 'SimpleXMLElement' ) ) {

tests/phpunit/tests/oembed/discovery.php

@@ -8 +8 @@
                 $this->assertSame( '', get_echo( 'wp_oembed_add_discovery_links' ) );
         }
 
+        function test_add_oembed_discovery_links_front_page() {
+                $this->go_to( home_url('/') );
+                $this->assertSame( '', get_echo( 'wp_oembed_add_discovery_links' ) );
+        }
+
+        function test_add_oembed_discovery_links_static_front_page() {
+                update_option( 'show_on_front', 'page' );
+                update_option( 'page_for_posts', self::factory()->post->create( array( 'post_title' => 'blog-page', 'post_type' => 'page' ) ) );
+                update_option( 'page_on_front', self::factory()->post->create( array( 'post_title' => 'front-page', 'post_type' => 'page' ) ) );
+
+                $this->go_to( home_url('/') );
+                $this->assertSame( '', get_echo( 'wp_oembed_add_discovery_links' ) );
+
+                update_option( 'show_on_front', 'posts' );
+        }
+
         function test_add_oembed_discovery_links_to_post() {
                 $post_id = self::factory()->post->create();
                 $this->go_to( get_permalink( $post_id ) );