Changeset 41606

Timestamp:

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

Author:

swissspidy

Message:

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

Props bor0.
Fixes #40673.

Location:

trunk

Files:

• src/wp-includes/embed.php (modified) (3 diffs)
• tests/phpunit/tests/oembed/wpOembed.php (modified) (1 diff)

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();
     }

trunk/tests/phpunit/tests/oembed/wpOembed.php

@@ -172 +172 @@
         $this->assertEquals( $this->pre_oembed_result_filtered, $actual );
     }
+
+    /**
+     * @ticket 40673
+     * @group multisite
+     * @group ms-required
+     */
+    public function test_wp_filter_pre_oembed_result_multisite_preserves_switched_state() {
+        $user_id = self::factory()->user->create();
+
+        $blog_id = self::factory()->blog->create( array( 'user_id' => $user_id ) );
+        switch_to_blog( $blog_id );
+
+        $expected_stack = $GLOBALS['_wp_switched_stack'];
+
+        $post_id   = self::factory()->post->create();
+        $permalink = get_permalink( $post_id );
+
+        add_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+        $actual = $this->oembed->get_html( $permalink );
+        remove_filter( 'pre_oembed_result', array( $this, '_filter_pre_oembed_result' ) );
+
+        $actual_stack = $GLOBALS['_wp_switched_stack'];
+
+        restore_current_blog();
+
+        $this->assertNotNull( $this->pre_oembed_result_filtered );
+        $this->assertEquals( $this->pre_oembed_result_filtered, $actual );
+        $this->assertSame( $expected_stack, $actual_stack );
+    }
 }