Changeset 54818 for branches/6.1

Timestamp:

11/11/2022 04:29:27 PM (2 years ago)

Author:

desrosj

Message:

Themes: Reduce usage of wp_get_theme function.

Calling the wp_get_theme function creates a instance of the WP_Theme class. This can be a performance issue, if all you need is one property of the class instance. This change replaces the usage of wp_get_theme()->get_stylesheet() with get_stylesheet() to improve performance.

Props spacedmonkey, flixos90, peterwilsoncc, desrosj.
Merges [54817] to the 6.1 branch.
Fixes #57057.

Location:

branches/6.1

Files:

• . (modified) (1 prop)
• src/wp-admin/site-editor.php (modified) (1 diff)
• src/wp-includes/block-template-utils.php (modified) (6 diffs)
• src/wp-includes/block-template.php (modified) (1 diff)
• src/wp-includes/blocks/template-part.php (modified) (1 diff)
• src/wp-includes/class-wp-theme-json-resolver.php (modified) (2 diffs)
• src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php (modified) (2 diffs)
• src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php (modified) (1 diff)
• src/wp-includes/theme-templates.php (modified) (2 diffs)

branches/6.1/src/wp-admin/site-editor.php

@@ -102 +102 @@
 
 $active_global_styles_id = WP_Theme_JSON_Resolver::get_user_global_styles_post_id();
-$active_theme            = wp_get_theme()->get_stylesheet();
+$active_theme            = get_stylesheet();
 $preload_paths           = array(
     array( '/wp/v2/media', 'OPTIONS' ),

branches/6.1/src/wp-includes/block-template-utils.php

@@ -438 +438 @@
             ! isset( $block['attrs']['theme'] )
         ) {
-            $block['attrs']['theme'] = wp_get_theme()->get_stylesheet();
+            $block['attrs']['theme'] = get_stylesheet();
             $has_updated_content     = true;
         }
@@ -500 +500 @@
     $default_template_types = get_default_block_template_types();
     $template_content       = file_get_contents( $template_file['path'] );
-    $theme                  = wp_get_theme()->get_stylesheet();
+    $theme                  = get_stylesheet();
 
     $template                 = new WP_Block_Template();
@@ -707 +707 @@
     $theme          = $terms[0]->name;
     $template_file  = _get_block_template_file( $post->post_type, $post->post_name );
-    $has_theme_file = wp_get_theme()->get_stylesheet() === $theme && null !== $template_file;
+    $has_theme_file = get_stylesheet() === $theme && null !== $template_file;
 
     $origin           = get_post_meta( $post->ID, 'origin', true );
@@ -904 +904 @@
                 'taxonomy' => 'wp_theme',
                 'field'    => 'name',
-                'terms'    => wp_get_theme()->get_stylesheet(),
+                'terms'    => get_stylesheet(),
             ),
         ),
@@ -970 +970 @@
 
             $is_not_custom   = false === array_search(
-                wp_get_theme()->get_stylesheet() . '//' . $template_file['slug'],
+                get_stylesheet() . '//' . $template_file['slug'],
                 wp_list_pluck( $query_result, 'id' ),
                 true
@@ -1111 +1111 @@
     list( $theme, $slug ) = $parts;
 
-    if ( wp_get_theme()->get_stylesheet() !== $theme ) {
+    if ( get_stylesheet() !== $theme ) {
         /** This filter is documented in wp-includes/block-template-utils.php */
         return apply_filters( 'get_block_file_template', null, $id, $template_type );

branches/6.1/src/wp-includes/block-template.php

@@ -146 +146 @@
     // Find all potential templates 'wp_template' post matching the hierarchy.
     $query     = array(
-        'theme'    => wp_get_theme()->get_stylesheet(),
+        'theme'    => get_stylesheet(),
         'slug__in' => $slugs,
     );

branches/6.1/src/wp-includes/blocks/template-part.php

@@ -23 +23 @@
         isset( $attributes['slug'] ) &&
         isset( $attributes['theme'] ) &&
-        wp_get_theme()->get_stylesheet() === $attributes['theme']
+        get_stylesheet() === $attributes['theme']
     ) {
         $template_part_id    = $attributes['theme'] . '//' . $attributes['slug'];

branches/6.1/src/wp-includes/class-wp-theme-json-resolver.php

@@ -244 +244 @@
         }
 
-        $options = wp_parse_args( $options, array( 'with_supports' => true ) );
+        $options  = wp_parse_args( $options, array( 'with_supports' => true ) );
 
         if ( null === static::$theme || ! static::has_same_registered_blocks( 'theme' ) ) {
             $theme_json_file = static::get_file_path_from_theme( 'theme.json' );
+            $wp_theme        = wp_get_theme();
             if ( '' !== $theme_json_file ) {
                 $theme_json_data = static::read_json_file( $theme_json_file );
-                $theme_json_data = static::translate( $theme_json_data, wp_get_theme()->get( 'TextDomain' ) );
+                $theme_json_data = static::translate( $theme_json_data, $wp_theme->get( 'TextDomain' ) );
             } else {
                 $theme_json_data = array();
@@ -266 +267 @@
             static::$theme   = new WP_Theme_JSON( $theme_json_data );
 
-            if ( wp_get_theme()->parent() ) {
+            if ( $wp_theme->parent() ) {
                 // Get parent theme.json.
                 $parent_theme_json_file = static::get_file_path_from_theme( 'theme.json', true );
                 if ( '' !== $parent_theme_json_file ) {
                     $parent_theme_json_data = static::read_json_file( $parent_theme_json_file );
-                    $parent_theme_json_data = static::translate( $parent_theme_json_data, wp_get_theme()->parent()->get( 'TextDomain' ) );
+                    $parent_theme_json_data = static::translate( $parent_theme_json_data, $wp_theme->parent()->get( 'TextDomain' ) );
                     $parent_theme           = new WP_Theme_JSON( $parent_theme_json_data );
 

branches/6.1/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php

@@ -565 +565 @@
      */
     public function get_theme_item( $request ) {
-        if ( wp_get_theme()->get_stylesheet() !== $request['stylesheet'] ) {
+        if ( get_stylesheet() !== $request['stylesheet'] ) {
             // This endpoint only supports the active theme for now.
             return new WP_Error(
@@ -639 +639 @@
      */
     public function get_theme_items( $request ) {
-        if ( wp_get_theme()->get_stylesheet() !== $request['stylesheet'] ) {
+        if ( get_stylesheet() !== $request['stylesheet'] ) {
             // This endpoint only supports the active theme for now.
             return new WP_Error(

branches/6.1/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php

@@ -529 +529 @@
             $changes->post_status = 'publish';
             $changes->tax_input   = array(
-                'wp_theme' => isset( $request['theme'] ) ? $request['theme'] : wp_get_theme()->get_stylesheet(),
+                'wp_theme' => isset( $request['theme'] ) ? $request['theme'] : get_stylesheet(),
             );
         } elseif ( 'custom' !== $template->source ) {

branches/6.1/src/wp-includes/theme-templates.php

@@ -28 +28 @@
     $terms = get_the_terms( $post_id, 'wp_theme' );
     if ( ! is_array( $terms ) || ! count( $terms ) ) {
-        wp_set_post_terms( $post_id, wp_get_theme()->get_stylesheet(), 'wp_theme' );
+        wp_set_post_terms( $post_id, get_stylesheet(), 'wp_theme' );
     }
 }
@@ -61 +61 @@
      * to the entity. So for now we use the currently activated theme for creation.
      */
-    $theme = wp_get_theme()->get_stylesheet();
+    $theme = get_stylesheet();
     $terms = get_the_terms( $post_ID, 'wp_theme' );
     if ( $terms && ! is_wp_error( $terms ) ) {