Ticket #45052: 45052.patch

src/wp-includes/embed.php

@@ -1102 +1102 @@
                         $path = reset( $path );
 
                         if ( $path ) {
-                                $qv['path'] = get_network()->path . $path . '/';
+                                // A blog prefix is added to the main site, we need to remove it.
+                                $qv['path'] = str_replace( '/blog/', '/', get_network()->path . $path . '/' );
                         }
                 }
 

tests/phpunit/tests/oembed/wpOembed.php

@@ -180 +180 @@
                 $this->assertEquals( $this->pre_oembed_result_filtered, $actual );
         }
 
+        /**
+         * @ticket 45052
+         * @group multisite
+         * @group ms-required
+         */
+        public function test_wp_filter_pre_oembed_result_multisite_sub_main_pretty_permalink() {
+                $this->set_permalink_structure( '/blog/%postname%/' );
+
+                $post_id   = self::factory()->post->create();
+                $permalink = get_permalink( $post_id );
+                $user_id   = self::factory()->user->create();
+                $blog_id   = self::factory()->blog->create(
+                        array(
+                                'user_id' => $user_id,
+                        )
+                );
+
+                switch_to_blog( $blog_id );
+
+                $this->set_permalink_structure( '/%postname%/' );
+
+                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' ) );
+
+                restore_current_blog();
+
+                $this->assertNotNull( $this->pre_oembed_result_filtered );
+                $this->assertEquals( $this->pre_oembed_result_filtered, $actual );
+        }
+
         /**
          * @ticket 40673
          * @group multisite