Changeset 56931 for trunk/src/wp-includes/block-patterns.php

Timestamp:

10/13/2023 04:44:09 PM (3 years ago)

Author:

flixos90

Message:

Themes: Clear existing pattern cache when in theme development mode and prevent PHP warning due to missing file.

Follow up to [56765].

Props spacedmonkey, afercia, jrf, flixos90.
Fixes #59591.
See #59490.

File:

• trunk/src/wp-includes/block-patterns.php (modified) (2 diffs)

trunk/src/wp-includes/block-patterns.php

@@ -351 +351 @@
                         }
 
+                        $file_path = $dirpath . $file;
+
+                        if ( ! file_exists( $file_path ) ) {
+                                _doing_it_wrong(
+                                        __FUNCTION__,
+                                        sprintf(
+                                                /* translators: %s: file name. */
+                                                __( 'Could not register file "%s" as a block pattern as the file does not exist.' ),
+                                                $file
+                                        ),
+                                        '6.4.0'
+                                );
+                                $theme->delete_pattern_cache();
+                                continue;
+                        }
+
                         // The actual pattern content is the output of the file.
                         ob_start();
-                        include $dirpath . $file;
+                        include $file_path;
                         $pattern_data['content'] = ob_get_clean();
                         if ( ! $pattern_data['content'] ) {
@@ -409 +425 @@
         $can_use_cached = ! wp_is_development_mode( 'theme' );
 
-        if ( $can_use_cached ) {
-                $pattern_data = $theme->get_pattern_cache();
-                if ( is_array( $pattern_data ) ) {
+        $pattern_data = $theme->get_pattern_cache();
+        if ( is_array( $pattern_data ) ) {
+                if ( $can_use_cached ) {
                         return $pattern_data;
                 }
+                // If in development mode, clear pattern cache.
+                $theme->delete_pattern_cache();
         }