Changeset 41634

Timestamp:

09/28/2017 04:28:46 PM (7 years ago)

Author:

ocean90

Message:

Embeds: In switched state, restore previous state if no post ID is found.

Fixes #40673.

Location:

trunk

Files:

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

trunk/src/wp-includes/embed.php

@@ -1107 +1107 @@
 
     if ( ! $post_id ) {
+        if ( $switched_blog ) {
+            restore_current_blog();
+        }
+
         return $result;
     }

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

@@ -201 +201 @@
         $this->assertSame( $expected_stack, $actual_stack );
     }
+
+    /**
+     * @ticket 40673
+     * @group multisite
+     * @group ms-required
+     */
+    public function test_wp_filter_pre_oembed_result_multisite_restores_state_if_no_post_is_found() {
+        $current_blog_id = get_current_blog_id();
+
+        $user_id = self::factory()->user->create();
+        $blog_id = self::factory()->blog->create( array(
+            'user_id' => $user_id,
+        ) );
+
+        $permalink = get_home_url( $blog_id, '/foo/' );
+
+        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' ) );
+
+        $this->assertNull( $this->pre_oembed_result_filtered );
+        $this->assertFalse( $actual );
+        $this->assertSame( $current_blog_id, get_current_blog_id() );
+    }
 }