diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/class-wp-site.php --- a/wp/wp-includes/class-wp-site.php Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-includes/class-wp-site.php Tue Dec 15 13:49:49 2020 +0100 @@ -162,16 +162,20 @@ $_site = wp_cache_get( $site_id, 'sites' ); - if ( ! $_site ) { + if ( false === $_site ) { $_site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->blogs} WHERE blog_id = %d LIMIT 1", $site_id ) ); if ( empty( $_site ) || is_wp_error( $_site ) ) { - return false; + $_site = -1; } wp_cache_add( $site_id, $_site, 'sites' ); } + if ( is_numeric( $_site ) ) { + return false; + } + return new WP_Site( $_site ); }