Changeset 36059

Timestamp:

12/22/2015 10:49:20 AM (11 years ago)

Author:

pento

Message:

Embeds: Don't show embed discovery link on a static front page.

There's currently no iframe content being generated for a static front page. Giving out a link to that isn't an ideal user experience.

Props peterwilsoncc.

Fixes #35194 for trunk.

Location:

trunk

Files:

• src/wp-includes/embed.php (modified) (1 diff)
• tests/phpunit/tests/oembed/discovery.php (modified) (1 diff)

trunk/src/wp-includes/embed.php

@@ -346 +346 @@
         $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";
 

trunk/tests/phpunit/tests/oembed/discovery.php

@@ -7 +7 @@
         function test_add_oembed_discovery_links_non_singular() {
                 $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' );
         }