Changeset 43810 for branches/5.0/src/wp-includes/embed.php

Timestamp:

10/23/2018 05:47:28 PM (6 years ago)

Author:

danielbachhuber

Message:

Embeds: Filter HTML response in oEmbed proxy controller.

Adapts the response from WP_oEmbed_Controller::get_proxy_item() so that the response is correctly filtered and embeds work properly in JavaSccript editors. Introduces new get_oembed_response_data_for_url() function for preparing internal oEmbed responses.

Props danielbachhuber, imath, swissspidy.
Fixes #45142.

File:

• branches/5.0/src/wp-includes/embed.php (modified) (2 diffs)

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

@@ -555 +555 @@
     return apply_filters( 'oembed_response_data', $data, $post, $width, $height );
 }
+
+
+/**
+ * Retrieves the oEmbed response data for a given URL.
+ *
+ * @since 5.0.0
+ *
+ * @param string $url  The URL that should be inspected for discovery `<link>` tags.
+ * @param array  $args oEmbed remote get arguments.
+ * @return object|false oEmbed response data if the URL does belong to the current site. False otherwise.
+ */
+function get_oembed_response_data_for_url( $url, $args ) {
+    $switched_blog = false;
+
+    if ( is_multisite() ) {
+        $url_parts = wp_parse_args( wp_parse_url( $url ), array(
+            'host'   => '',
+            'path'   => '/',
+        ) );
+
+        $qv = array( 'domain' => $url_parts['host'], 'path' => '/' );
+
+        // In case of subdirectory configs, set the path.
+        if ( ! is_subdomain_install() ) {
+            $path = explode( '/', ltrim( $url_parts['path'], '/' ) );
+            $path = reset( $path );
+
+            if ( $path ) {
+                $qv['path'] = get_network()->path . $path . '/';
+            }
+        }
+
+        $sites = get_sites( $qv );
+        $site  = reset( $sites );
+
+        if ( $site && (int) $site->blog_id !== get_current_blog_id() ) {
+            switch_to_blog( $site->blog_id );
+            $switched_blog = true;
+        }
+    }
+
+    $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 );
+
+    if ( ! $post_id ) {
+        if ( $switched_blog ) {
+            restore_current_blog();
+        }
+
+        return false;
+    }
+
+    $width = isset( $args['width'] ) ? $args['width'] : 0;
+
+    $data = get_oembed_response_data( $post_id, $width );
+
+    if ( $switched_blog ) {
+        restore_current_blog();
+    }
+
+    return $data ? (object) $data : false;
+}
+
 
 /**
@@ -1072 +1137 @@
  */
 function wp_filter_pre_oembed_result( $result, $url, $args ) {
-    $switched_blog = false;
-
-    if ( is_multisite() ) {
-        $url_parts = wp_parse_args( wp_parse_url( $url ), array(
-            'host'   => '',
-            'path'   => '/',
-        ) );
-
-        $qv = array( 'domain' => $url_parts['host'], 'path' => '/' );
-
-        // In case of subdirectory configs, set the path.
-        if ( ! is_subdomain_install() ) {
-            $path = explode( '/', ltrim( $url_parts['path'], '/' ) );
-            $path = reset( $path );
-
-            if ( $path ) {
-                $qv['path'] = get_network()->path . $path . '/';
-            }
-        }
-
-        $sites = get_sites( $qv );
-        $site  = reset( $sites );
-
-        if ( $site && (int) $site->blog_id !== get_current_blog_id() ) {
-            switch_to_blog( $site->blog_id );
-            $switched_blog = true;
-        }
-    }
-
-    $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 );
-
-    if ( ! $post_id ) {
-        if ( $switched_blog ) {
-            restore_current_blog();
-        }
-
-        return $result;
-    }
-
-    $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 ( $switched_blog ) {
-        restore_current_blog();
-    }
-
-    if ( ! $data ) {
-        return $result;
-    }
-
-    return $data;
-}
+    $data = get_oembed_response_data_for_url( $url, $args );
+
+    if ( $data ) {
+        return _wp_oembed_get_object()->data2html( $data, $url );
+    }
+
+    return $result;
+}