Changeset 41600 for trunk/src/wp-includes/embed.php

Timestamp:

09/26/2017 08:39:57 AM (8 years ago)

Author:

swissspidy

Message:

Embeds: Improve performance when embedding a post on Multisite.

After [37798], this fixes embeds coming from a different site in the network.

Props imath.
Fixes #40673. See #36767.

File:

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

trunk/src/wp-includes/embed.php

@@ -1072 +1072 @@
  */
 function wp_filter_pre_oembed_result( $result, $url, $args ) {
+    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 );
+        }
+    }
+
     $post_id = url_to_postid( $url );
 
@@ -1086 +1112 @@
     $data = _wp_oembed_get_object()->data2html( (object) $data, $url );
 
+    if ( is_multisite() && ms_is_switched() ) {
+        restore_current_blog();
+    }
+
     if ( ! $data ) {
         return $result;