Ticket #40673: 40673.2.patch

wp-includes/embed.php

@@ -1071 +1071 @@
  *                     Null if the URL does not belong to the current site.
  */
 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'   => '',
@@ -1094 +1096 @@
 
                 if ( $site && (int) $site->blog_id !== get_current_blog_id() ) {
                         switch_to_blog( $site->blog_id );
+                        $switched_blog = true;
                 }
         }
 
@@ -1111 +1114 @@
         $data = get_oembed_response_data( $post_id, $width );
         $data = _wp_oembed_get_object()->data2html( (object) $data, $url );
 
-        if ( is_multisite() && ms_is_switched() ) {
+        if ( $switched_blog ) {
                 restore_current_blog();
         }