Changeset 52275 for trunk/src/wp-includes/class-wp-theme-json-resolver.php

Timestamp:

11/30/2021 12:22:30 AM (3 years ago)

Author:

noisysocks

Message:

Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

• Update Pattern block category and add documentation
• Fix non existent menu handling in nav block
• Make Reusable blocks available in the Site Editor
• Add caching to WP_Theme_JSON_Resolver_Gutenberg::get_user_data_from_custom_post_type()
• theme.json: add appearanceTools flag to opt-in into appearance UI controls
• Update the block theme folders to templates and parts
• Remove reference to gutenberg_, swap with wp_
• Use table layout in templates list screen
• Update featured image placeholder graphic.
• [Inserter]: Adjust order of theme blocks and reorder inserter items
• Implement suitable fallback for Nav block on front end of site when no menu selected
• Toggle Group Control: add tooltip
• Use first non-empty Nav post as primary fallback for Nav block
• Change .nvmrc and documentation for Node.js version (LTS to 14.18.1)
• Update: Migrate global styles user database data on the rest endpoint
• Update global styles public API
• Update: Rename user preset origin to custom
• Try always generating navigation post title
• Show all templates and template parts on the site editor list screens
• Highlight "Site" in the navigation panel
• Fix template part slug generation when creating through the block placeholder
• [Block Library - Post Title]: Fix render error when setting Page to homepage
• Add 'Clear customizations' button to template list page
• Gallery v1: Allow clicks within replace media placeholder state
• Site Editor: Set the <title> on the list page to be same as the CPT name
• Gallery: Fix stuck image size options loader
• Cover: Fix undo trap
• Add success and error snackbars to the templates list page
• Fix: theme colors cannot override defaults
• Fix: Color palette is not being stored
• Add elements support to the typography panel in global styles
• Make links plural in global styles
• Add: Gradient palette editor
• Update some small style regressions in the template list
• Add: Transparency support on global styles colors
• Fix: apply by slug on all origins
• Render empty Nav block if no fallback block can be utilised
• Allow filtering of Nav block fallback
• Fix Nav block fallback DB query to match on full block grammar start tag
• Remove unstable max pages attribute from Nav block
• DateTimePicker: set PM hours correctly
• Update delete template button
• Site Editor: Template list add rename action
• Fix Nav block editing wrong entity on creation of new Menu
• [REST] Restore the missing double slash in the ID received by /templates
• Add icons to navigation sidebar items
• Update function names for the public global styles API functions
• Templates Controller: Add missing 'is_custom' prop
• Rename gutenberg_ to wp_ for some functions that land in WordPress 5.9
• [Block Library - Template Part]:Remove support for conversion to Reusable block
• Global Styles: Call "palettes" and not "color palettes" on panel label
• Add button text when no colors found
• Update: Global Styes: Count all color palette origins on the palette counter
• Rename navigationMenuId to ref
• Offset the parent iframe when computing Popover position
• Fix: Failing PHPUnit test
• Show theme, plugin or author in Added By column with appropriate icon or avatar
• Add origin and author to template rest api

See #54487.
Props talldanwp, mamaduka, oandregal.

File:

• trunk/src/wp-includes/class-wp-theme-json-resolver.php (modified) (9 diffs)

trunk/src/wp-includes/class-wp-theme-json-resolver.php

@@ -223 +223 @@
      * @since 5.9.0
      *
-     * @param bool  $should_create_cpt  Optional. Whether a new custom post type should be created if none are found.
-     *                                  False by default.
-     * @param array $post_status_filter Filter Optional. custom post type by post status.
-     *                                   ['publish'] by default, so it only fetches published posts.
-     *
+     * @param WP_Theme $theme              The theme object.  If empty, it
+     *                                     defaults to the current theme.
+     * @param bool     $should_create_cpt  Optional. Whether a new custom post
+     *                                     type should be created if none are
+     *                                     found.  False by default.
+     * @param array    $post_status_filter Filter Optional. custom post type by
+     *                                     post status.  ['publish'] by default,
+     *                                     so it only fetches published posts.
      * @return array Custom Post Type for the user's origin config.
      */
-    private static function get_user_data_from_custom_post_type( $should_create_cpt = false, $post_status_filter = array( 'publish' ) ) {
+    public static function get_user_data_from_custom_post_type( $theme, $should_create_cpt = false, $post_status_filter = array( 'publish' ) ) {
+        if ( ! $theme instanceof WP_Theme ) {
+            $theme = wp_get_theme();
+        }
         $user_cpt         = array();
         $post_type_filter = 'wp_global_styles';
-        $query            = new WP_Query(
-            array(
-                'posts_per_page' => 1,
-                'orderby'        => 'date',
-                'order'          => 'desc',
-                'post_type'      => $post_type_filter,
-                'post_status'    => $post_status_filter,
-                'tax_query'      => array(
-                    array(
-                        'taxonomy' => 'wp_theme',
-                        'field'    => 'name',
-                        'terms'    => wp_get_theme()->get_stylesheet(),
-                    ),
+        $args             = array(
+            'numberposts' => 1,
+            'orderby'     => 'date',
+            'order'       => 'desc',
+            'post_type'   => $post_type_filter,
+            'post_status' => $post_status_filter,
+            'tax_query'   => array(
+                array(
+                    'taxonomy' => 'wp_theme',
+                    'field'    => 'name',
+                    'terms'    => $theme->get_stylesheet(),
                 ),
-            )
+            ),
         );
 
-        if ( is_array( $query->posts ) && ( 1 === $query->post_count ) ) {
-            $user_cpt = $query->posts[0]->to_array();
+        $cache_key = sprintf( 'wp_global_styles_%s', md5( serialize( $args ) ) );
+        $post_id   = wp_cache_get( $cache_key );
+
+        if ( (int) $post_id > 0 ) {
+            return get_post( $post_id, ARRAY_A );
+        }
+
+        // Special case: '-1' is a results not found.
+        if ( -1 === $post_id && ! $should_create_cpt ) {
+            return $user_cpt;
+        }
+
+        $recent_posts = wp_get_recent_posts( $args );
+        if ( is_array( $recent_posts ) && ( count( $recent_posts ) === 1 ) ) {
+            $user_cpt = $recent_posts[0];
         } elseif ( $should_create_cpt ) {
             $cpt_post_id = wp_insert_post(
@@ -266 +283 @@
                 true
             );
-
-            if ( is_wp_error( $cpt_post_id ) ) {
-                $user_cpt = array();
-            } else {
-                $user_cpt = get_post( $cpt_post_id, ARRAY_A );
-            }
-        }
+            $user_cpt    = get_post( $cpt_post_id, ARRAY_A );
+        }
+        $cache_expiration = $user_cpt ? DAY_IN_SECONDS : HOUR_IN_SECONDS;
+        wp_cache_set( $cache_key, $user_cpt ? $user_cpt['ID'] : -1, '', $cache_expiration );
 
         return $user_cpt;
@@ -290 +304 @@
 
         $config   = array();
-        $user_cpt = self::get_user_data_from_custom_post_type();
+        $user_cpt = self::get_user_data_from_custom_post_type( wp_get_theme() );
 
         if ( array_key_exists( 'post_content', $user_cpt ) ) {
@@ -298 +312 @@
             if ( JSON_ERROR_NONE !== $json_decoding_error ) {
                 trigger_error( 'Error when decoding a theme.json schema for user data. ' . json_last_error_msg() );
-                return new WP_Theme_JSON( $config, 'user' );
+                return new WP_Theme_JSON( $config, 'custom' );
             }
 
@@ -312 +326 @@
             }
         }
-        self::$user = new WP_Theme_JSON( $config, 'user' );
+        self::$user = new WP_Theme_JSON( $config, 'custom' );
 
         return self::$user;
@@ -319 +333 @@
     /**
      * There are three sources of data (origins) for a site:
-     * default, theme, and user. The user's has higher priority
-     * than the theme's, and the theme's higher than core's.
+     * default, theme, and custom. The custom's has higher priority
+     * than the theme's, and the theme's higher than default's.
      *
      * Unlike the getters {@link get_core_data},
@@ -337 +351 @@
      *
      * @param string $origin Optional. To what level should we merge data.
-     *                       Valid values are 'theme' or 'user'.
-     *                       Default is 'user'.
+     *                       Valid values are 'theme' or 'custom'.
+     *                       Default is 'custom'.
      * @return WP_Theme_JSON
      */
-    public static function get_merged_data( $origin = 'user' ) {
+    public static function get_merged_data( $origin = 'custom' ) {
         if ( is_array( $origin ) ) {
             _deprecated_argument( __FUNCTION__, '5.9' );
@@ -350 +364 @@
         $result->merge( self::get_theme_data() );
 
-        if ( 'user' === $origin ) {
+        if ( 'custom' === $origin ) {
             $result->merge( self::get_user_data() );
         }
@@ -370 +384 @@
         }
 
-        $user_cpt = self::get_user_data_from_custom_post_type( true );
+        $user_cpt = self::get_user_data_from_custom_post_type( wp_get_theme(), true );
 
         if ( array_key_exists( 'ID', $user_cpt ) ) {