Revert changes based on feedback.

WordPress · Jan 9, 2024 · c1e9415 · c1e9415
1 parent 3cc7133
commit c1e9415
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 30 deletions.
diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php
@@ -1830,23 +1830,31 @@ public function get_block_template_folders() {
 	 * @return array Block pattern data.
 	 */
 	public function get_block_patterns() {
+		$can_use_cached = ! wp_is_development_mode( 'theme' );
+
 		$pattern_data = $this->get_pattern_cache();
 		if ( is_array( $pattern_data ) ) {
-			return $pattern_data;
+			if ( $can_use_cached ) {
+				return $pattern_data;
+			}
+			// If in development mode, clear pattern cache.
+			$this->delete_pattern_cache();
 		}
 
 		$dirpath      = $this->get_stylesheet_directory() . '/patterns/';
 		$pattern_data = array();
 
 		if ( ! file_exists( $dirpath ) ) {
-			$this->set_pattern_cache( $pattern_data );
-
+			if ( $can_use_cached ) {
+				$this->set_pattern_cache( $pattern_data );
+			}
 			return $pattern_data;
 		}
 		$files = glob( $dirpath . '*.php' );
 		if ( ! $files ) {
-			$this->set_pattern_cache( $pattern_data );
-
+			if ( $can_use_cached ) {
+				$this->set_pattern_cache( $pattern_data );
+			}
 			return $pattern_data;
 		}
 
@@ -1948,7 +1956,9 @@ public function get_block_patterns() {
 			$pattern_data[ $key ] = $pattern;
 		}
 
-		$this->set_pattern_cache( $pattern_data );
+		if ( $can_use_cached ) {
+			$this->set_pattern_cache( $pattern_data );
+		}
 
 		return $pattern_data;
 	}

diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php
@@ -882,12 +882,7 @@ function wp_start_object_cache() {
 			)
 		);
 
-		$non_persistent_groups = array( 'counts', 'plugins', 'theme_json' );
-		if ( wp_is_development_mode( 'theme' ) ) {
-			$non_persistent_groups[] = 'theme_files';
-		}
-
-		wp_cache_add_non_persistent_groups( $non_persistent_groups );
+		wp_cache_add_non_persistent_groups( array( 'counts', 'plugins', 'theme_json' ) );
 	}
 
 	$first_init = false;

diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php
@@ -578,12 +578,7 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
 				);
 			}
 
-			$non_persistent_groups = array( 'counts', 'plugins', 'theme_json' );
-			if ( wp_is_development_mode( 'theme' ) ) {
-				$non_persistent_groups[] = 'theme_files';
-			}
-
-			wp_cache_add_non_persistent_groups( $non_persistent_groups );
+			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins', 'theme_json' ) );
 		}
 	}
 
@@ -677,12 +672,7 @@ function restore_current_blog() {
 				);
 			}
 
-			$non_persistent_groups = array( 'counts', 'plugins', 'theme_json' );
-			if ( wp_is_development_mode( 'theme' ) ) {
-				$non_persistent_groups[] = 'theme_files';
-			}
-
-			wp_cache_add_non_persistent_groups( $non_persistent_groups );
+			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins', 'theme_json' ) );
 		}
 	}
 

diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php
@@ -423,12 +423,7 @@ public static function flush_cache() {
 			)
 		);
 
-		$non_persistent_groups = array( 'counts', 'plugins', 'theme_json' );
-		if ( wp_is_development_mode( 'theme' ) ) {
-			$non_persistent_groups[] = 'theme_files';
-		}
-
-		wp_cache_add_non_persistent_groups( $non_persistent_groups );
+		wp_cache_add_non_persistent_groups( array( 'counts', 'plugins', 'theme_json' ) );
 	}
 
 	/**