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

Timestamp:

10/03/2023 06:17:03 PM (12 months ago)

Author:

flixos90

Message:

Editor: Simplify return shape and logic of _wp_get_block_patterns().

Follow up to [56765].

Props spacedmonkey.
Fixes #59490.

File:

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

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

@@ -342 +342 @@
 
     foreach ( $themes as $theme ) {
-        $pattern_data = _wp_get_block_patterns( $theme );
-        $dirpath      = $theme->get_stylesheet_directory() . '/patterns/';
-        $text_domain  = $theme->get( 'TextDomain' );
-
-        foreach ( $pattern_data['patterns'] as $file => $pattern_data ) {
+        $patterns    = _wp_get_block_patterns( $theme );
+        $dirpath     = $theme->get_stylesheet_directory() . '/patterns/';
+        $text_domain = $theme->get( 'TextDomain' );
+
+        foreach ( $patterns as $file => $pattern_data ) {
             if ( $registry->is_registered( $pattern_data['slug'] ) ) {
                 continue;
@@ -406 +406 @@
  * @return array Block pattern data.
  */
-
 function _wp_get_block_patterns( WP_Theme $theme ) {
-    if ( ! $theme->exists() ) {
-        return array(
-            'version'  => false,
-            'patterns' => array(),
-        );
-    }
-
-    $transient_name = 'wp_theme_patterns_' . $theme->get_stylesheet();
-    $version        = $theme->get( 'Version' );
     $can_use_cached = ! wp_is_development_mode( 'theme' );
 
     if ( $can_use_cached ) {
-        $pattern_data = get_transient( $transient_name );
-        if ( is_array( $pattern_data ) && $pattern_data['version'] === $version ) {
+        $pattern_data = $theme->get_pattern_cache();
+        if ( is_array( $pattern_data ) ) {
             return $pattern_data;
         }
     }
 
-    $pattern_data = array(
-        'version'  => $version,
-        'patterns' => array(),
-    );
     $dirpath      = $theme->get_stylesheet_directory() . '/patterns/';
+    $pattern_data = array();
 
     if ( ! file_exists( $dirpath ) ) {
         if ( $can_use_cached ) {
-            set_transient( $transient_name, $pattern_data );
+            $theme->set_pattern_cache( $pattern_data );
         }
         return $pattern_data;
@@ -441 +428 @@
     if ( ! $files ) {
         if ( $can_use_cached ) {
-            set_transient( $transient_name, $pattern_data );
+            $theme->set_pattern_cache( $pattern_data );
         }
         return $pattern_data;
@@ -474 +461 @@
                 __FUNCTION__,
                 sprintf(
-                    /* translators: %s: file name. */
+                    /* translators: 1: file name. */
                     __( 'Could not register file "%s" as a block pattern ("Slug" field missing)' ),
                     $file
@@ -487 +474 @@
                 __FUNCTION__,
                 sprintf(
-                    /* translators: %1s: file name; %2s: slug value found. */
+                    /* translators: 1: file name; 2: slug value found. */
                     __( 'Could not register file "%1$s" as a block pattern (invalid slug "%2$s")' ),
                     $file,
@@ -501 +488 @@
                 __FUNCTION__,
                 sprintf(
-                    /* translators: %1s: file name. */
+                    /* translators: 1: file name. */
                     __( 'Could not register file "%s" as a block pattern ("Title" field missing)' ),
                     $file
@@ -541 +528 @@
         $key = str_replace( $dirpath, '', $file );
 
-        $pattern_data['patterns'][ $key ] = $pattern;
+        $pattern_data[ $key ] = $pattern;
     }
 
     if ( $can_use_cached ) {
-        set_transient( $transient_name, $pattern_data );
+        $theme->set_pattern_cache( $pattern_data );
     }