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

Timestamp:

09/27/2017 08:35:16 AM (8 years ago)

Author:

swissspidy

Message:

Embeds: Maintain switched state when embedding a post on Multisite.

Props bor0.
Fixes #40673.

File:

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

trunk/src/wp-includes/embed.php

@@ -1072 +1072 @@
  */
 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(
@@ -1095 +1097 @@
         if ( $site && (int) $site->blog_id !== get_current_blog_id() ) {
             switch_to_blog( $site->blog_id );
+            $switched_blog = true;
         }
     }
@@ -1112 +1115 @@
     $data = _wp_oembed_get_object()->data2html( (object) $data, $url );
 
-    if ( is_multisite() && ms_is_switched() ) {
+    if ( $switched_blog ) {
         restore_current_blog();
     }