Ticket #59297: 59297.7.patch

src/wp-includes/ms-settings.php

@@ -81 +81 @@
         }
         unset( $bootstrap_result );
 
-        $blog_id = $current_blog->blog_id;
         $public  = $current_blog->public;
 
         if ( empty( $current_blog->site_id ) ) {
@@ -97 +96 @@
 $wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php.
 $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
 $table_prefix       = $wpdb->get_blog_prefix();
-$_wp_switched_stack = array();
-$switched           = false;
 
 // Need to init cache again after blog_id is set.
 wp_start_object_cache();

src/wp-includes/rest-api/class-wp-rest-server.php

@@ -1062 +1062 @@
 
                         foreach ( $handlers as $handler ) {
                                 $callback = $handler['callback'];
-                                $response = null;
 
                                 // Fallback to GET method if no HEAD method is registered.
                                 $checked_method = $method;