Invalidate site-details cache on blog option changes and handle empty blog ID in update_blog_option()

Author: soderlind

src/wp-includes/ms-blogs.php

@@ -494,6 +494,12 @@ function add_blog_option( $id, $option, $value ) {
 	wp_cache_delete( $id, 'blog-alloptions' );
 	wp_cache_delete( $id, 'blog-notoptions' );
 
+	// Invalidate site-details cache when a site-detail option changes.
+	if ( in_array( $option, array( 'home', 'siteurl', 'blogname', 'post_count' ), true ) ) {
+		wp_cache_delete( $id, 'site-details' );
+		wp_cache_delete( $id, 'blog-details' );
+	}
+
 	return false !== $result;
 }
 
@@ -530,6 +536,12 @@ function delete_blog_option( $id, $option ) {
 	wp_cache_delete( $id, 'blog-alloptions' );
 	wp_cache_delete( $id, 'blog-notoptions' );
 
+	// Invalidate site-details cache when a site-detail option changes.
+	if ( in_array( $option, array( 'home', 'siteurl', 'blogname', 'post_count' ), true ) ) {
+		wp_cache_delete( $id, 'site-details' );
+		wp_cache_delete( $id, 'blog-details' );
+	}
+
 	return false !== $result && $result > 0;
 }
 
@@ -553,6 +565,10 @@ function update_blog_option( $id, $option, $value, $deprecated = null ) {
 		_deprecated_argument( __FUNCTION__, '3.1.0' );
 	}
 
+	if ( empty( $id ) ) {
+		$id = get_current_blog_id();
+	}
+
 	if ( get_current_blog_id() === $id ) {
 		return update_option( $option, $value );
 	}
@@ -597,6 +613,12 @@ function update_blog_option( $id, $option, $value, $deprecated = null ) {
 	wp_cache_delete( $id, 'blog-alloptions' );
 	wp_cache_delete( $id, 'blog-notoptions' );
 
+	// Invalidate site-details cache when a site-detail option changes.
+	if ( in_array( $option, array( 'home', 'siteurl', 'blogname', 'post_count' ), true ) ) {
+		wp_cache_delete( $id, 'site-details' );
+		wp_cache_delete( $id, 'blog-details' );
+	}
+
 	return false !== $result;
 }