Changeset 37709

Timestamp:

06/15/2016 11:31:12 AM (8 years ago)

Author:

swissspidy

Message:

Embeds: Improve performance when embedding a post of the current site.

When the post being embedded is from the same site, there's no reason to do an HTTP request for it. The data can be fetched directly using get_oembed_response_data().

Merge of [37708] to the 4.5 branch.

Fixes #36767.

Location:

branches/4.5

Files:

• . (modified) (1 prop)
• src/wp-includes/class-oembed.php (modified) (1 diff)
• src/wp-includes/default-filters.php (modified) (1 diff)
• src/wp-includes/embed.php (modified) (1 diff)
• tests/phpunit/tests/oembed/wpOembed.php (copied) (copied from trunk/tests/phpunit/tests/oembed/wpOembed.php)

branches/4.5/src/wp-includes/class-oembed.php

@@ -316 +316 @@
      */
     public function get_html( $url, $args = '' ) {
+        /**
+         * Filters the oEmbed result before any HTTP requests are made.
+         *
+         * This allows one to short-circuit the default logic, perhaps by
+         * replacing it with a routine that is more optimal for your setup.
+         *
+         * Passing a non-null value to the filter will effectively short-circuit retrieval,
+         * returning the passed value instead.
+         *
+         * @since 4.5.3
+         *
+         * @param null|string $result The UNSANITIZED (and potentially unsafe) HTML that should be used to embed. Default null.
+         * @param string      $url    The URL to the content that should be attempted to be embedded.
+         * @param array       $args   Optional. Arguments, usually passed from a shortcode. Default empty.
+         */
+        $pre = apply_filters( 'pre_oembed_result', null, $url, $args );
+
+        if ( null !== $pre ) {
+            return $pre;
+        }
+
         $provider = $this->get_provider( $url, $args );
 
-        if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) )
-            return false;
+        if ( ! $provider || false === $data = $this->fetch( $provider, $url, $args ) ) {
+            return false;
+        }
 
         /**

branches/4.5/src/wp-includes/default-filters.php

@@ -477 +477 @@
 add_filter( 'oembed_dataparse',       'wp_filter_oembed_result',        10, 3 );
 add_filter( 'oembed_response_data',   'get_oembed_response_data_rich',  10, 4 );
+add_filter( 'pre_oembed_result',      'wp_filter_pre_oembed_result',    10, 3 );
 
 unset( $filter, $action );

branches/4.5/src/wp-includes/embed.php

@@ -1080 +1080 @@
     echo apply_filters( 'embed_site_title_html', $site_title );
 }
+
+/**
+ * Filters the oEmbed result before any HTTP requests are made.
+ *
+ * If the URL belongs to the current site, the result is fetched directly instead of
+ * going through the oEmbed discovery process.
+ *
+ * @since 4.5.3
+ *
+ * @param null|string $result The UNSANITIZED (and potentially unsafe) HTML that should be used to embed. Default null.
+ * @param string      $url    The URL that should be inspected for discovery `<link>` tags.
+ * @param array       $args   oEmbed remote get arguments.
+ * @return null|string The UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
+ *                     Null if the URL does not belong to the current site.
+ */
+function wp_filter_pre_oembed_result( $result, $url, $args ) {
+    $post_id = url_to_postid( $url );
+
+    /** This filter is documented in wp-includes/class-wp-oembed-controller.php */
+    $post_id = apply_filters( 'oembed_request_post_id', $post_id, $url );
+
+    $width = isset( $args['width'] ) ? $args['width'] : 0;
+
+    $data = get_oembed_response_data( $post_id, $width );
+    $data = _wp_oembed_get_object()->data2html( (object) $data, $url );
+
+    if ( ! $data ) {
+        return $result;
+    }
+
+    return $data;
+}