Changeset 61119

Timestamp:

11/04/2025 12:45:02 AM (4 months ago)

Author:

westonruter

Message:

Embeds: Add wp_oembed_add_discovery_links() to run earlier at wp_head priority 4.

This results in the oEmbed discovery links being printed before scripts and styles are printed. This helps ensure they appear within the first 150K bytes of the HTML response, which is required by WP_oEmbed::discover(). With increasing the styles_inline_size_limit from 20K to 40K in #63018, it becomes more probable that the oEmbed discovery links will be pushed out of range.

For backwards compatibility with themes and plugins that disable the oEmbed discovery links by unhooking wp_oembed_add_discovery_links() from running at wp_head priority 10 (even though the oembed_discovery_links filter is available to disable such links), this callback is added a second time to run earlier at priority 4. The first time the function runs, it checks to see if the callback is still hooked at priority 10. If not, the function short circuits. If it is still hooked at priority 10, however, the function then unhooks itself at priority 10 so that it won't run a second time later during the wp_head action, before proceeding with printing the discovery links. A similar back-compat approach was taken previously in [60910]. The back-compat checks are only performed if the function is invoked during the wp_head action, allowing the function to be called "idempotently" elsewhere.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10449

Follow-up to [61118], [61117].

Props westonruter, swissspidy.
See #64186, #63018.
Fixes #64178.

Location:

trunk

Files:

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

trunk/src/wp-includes/default-filters.php

@@ -705 +705 @@
 add_filter( 'rest_pre_serve_request', '_oembed_rest_pre_serve_request', 10, 4 );
 
-add_action( 'wp_head', 'wp_oembed_add_discovery_links' );
+add_action( 'wp_head', 'wp_oembed_add_discovery_links', 4 ); // Printed after feed_links() and feed_links_extra().
+add_action( 'wp_head', 'wp_oembed_add_discovery_links' ); // Unhooked the first time that wp_oembed_add_discovery_links() runs for back-compat.
 add_action( 'wp_head', 'wp_oembed_add_host_js' ); // Back-compat for sites disabling oEmbed host JS by removing action.
 add_filter( 'embed_oembed_html', 'wp_maybe_enqueue_oembed_host_js' );

trunk/src/wp-includes/embed.php

@@ -333 +333 @@
  * @since 4.4.0
  * @since 6.8.0 Output was adjusted to only embed if the post supports it.
+ * @since 6.9.0 Now runs first at `wp_head` priority 4, with a fallback to priority 10. This helps ensure the discovery links appear within the first 150KB.
  */
 function wp_oembed_add_discovery_links() {
+    if ( doing_action( 'wp_head' ) ) {
+        // For back-compat, short-circuit if a plugin has removed the action at the original priority.
+        if ( ! has_action( 'wp_head', 'wp_oembed_add_discovery_links', 10 ) ) {
+            return;
+        }
+
+        // Prevent running again at the original priority.
+        remove_action( 'wp_head', 'wp_oembed_add_discovery_links' );
+    }
+
     $output = '';
 

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

@@ -50 +50 @@
 
         $this->assertSame( $expected, get_echo( 'wp_oembed_add_discovery_links' ) );
+
+        add_filter( 'oembed_discovery_links', '__return_empty_string' );
+        $this->assertSame( '', get_echo( 'wp_oembed_add_discovery_links' ), 'Expected filtering oembed_discovery_links to empty string to result in no wp_oembed_add_discovery_links() output.' );
     }
 
@@ -101 +104 @@
         $this->assertFalse( get_oembed_response_data( $post, 100 ) );
     }
+
+    /**
+     * @ticket 64178
+     * @covers ::wp_oembed_add_discovery_links
+     */
+    public function test_wp_oembed_add_discovery_links_back_compat() {
+        $action       = 'wp_head';
+        $old_priority = 10;
+        $new_priority = 4;
+        $callback     = 'wp_oembed_add_discovery_links';
+
+        $this->assertTrue( has_action( $action, $callback, $old_priority ), 'Expected wp_oembed_add_discovery_links() to be hooked at wp_head with old priority.' );
+        $this->assertTrue( has_action( $action, $callback, $new_priority ), 'Expected wp_oembed_add_discovery_links() to be hooked at wp_head with new priority.' );
+
+        // Remove all wp_head actions and re-add just the one being tested.
+        remove_all_actions( $action );
+        add_action( $action, $callback, $old_priority );
+        add_action( $action, $callback, $new_priority );
+
+        $post_id = self::factory()->post->create();
+        $this->go_to( get_permalink( $post_id ) );
+        $this->assertQueryTrue( 'is_single', 'is_singular' );
+
+        $mock_action = new MockAction();
+        add_filter( 'oembed_discovery_links', array( $mock_action, 'filter' ) );
+
+        $wp_head_output = get_echo( 'wp_head' );
+        $this->assertSame( 1, $mock_action->get_call_count() );
+
+        $expected  = '<link rel="alternate" title="oEmbed (JSON)" type="application/json+oembed" href="' . esc_url( get_oembed_endpoint_url( get_permalink() ) ) . '" />' . "\n";
+        $expected .= '<link rel="alternate" title="oEmbed (XML)" type="text/xml+oembed" href="' . esc_url( get_oembed_endpoint_url( get_permalink(), 'xml' ) ) . '" />' . "\n";
+
+        $this->assertSame( $expected, $wp_head_output, 'Expected wp_head output to be the same as the wp_oembed_add_discovery_links() output.' );
+        $this->assertSame( $expected, get_echo( $callback ), 'Expected wp_oembed_add_discovery_links() output to be the same as the wp_head output when called outside of wp_head.' );
+    }
 }