Changeset 56523

Timestamp:

09/06/2023 12:58:47 PM (13 months ago)

Author:

spacedmonkey

Message:

Themes: Remove unnecessary check if file exists in the theme functions.

Previously, several functions and methods in themes api were designed to check for the existence of files in a child theme before falling back to the parent theme. However, these checks did not consider whether the current theme was a child theme or not, resulting in unnecessary file existence checks for non-child themes. Check to see if stylesheet directory matches the template directory before doing the file exists. This optimization helps reduce unnecessary file system access, as file existence checks can be resource-intensive in PHP.

The following functions and methods have been updated as part of this enhancement:

• WP_Theme::get_file_path
• get_theme_file_path
• get_theme_file_uri

Props spacedmonkey, flixos90, sabernhardt, 10upsimon, mukesh27.
Fixes #59279.

Location:

trunk/src/wp-includes

Files:

• class-wp-theme.php (modified) (1 diff)
• link-template.php (modified) (2 diffs)

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

@@ -1557 +1557 @@
         if ( empty( $file ) ) {
             $path = $stylesheet_directory;
-        } elseif ( file_exists( $stylesheet_directory . '/' . $file ) ) {
+        } elseif ( $stylesheet_directory !== $template_directory && file_exists( $stylesheet_directory . '/' . $file ) ) {
             $path = $stylesheet_directory . '/' . $file;
         } else {

trunk/src/wp-includes/link-template.php

@@ -4540 +4540 @@
     $file = ltrim( $file, '/' );
 
+    $stylesheet_directory = get_stylesheet_directory();
+
     if ( empty( $file ) ) {
         $url = get_stylesheet_directory_uri();
-    } elseif ( file_exists( get_stylesheet_directory() . '/' . $file ) ) {
+    } elseif ( get_template_directory() !== $stylesheet_directory && file_exists( $stylesheet_directory . '/' . $file ) ) {
         $url = get_stylesheet_directory_uri() . '/' . $file;
     } else {
@@ -4601 +4603 @@
     $file = ltrim( $file, '/' );
 
+    $stylesheet_directory = get_stylesheet_directory();
+    $template_directory   = get_template_directory();
+
     if ( empty( $file ) ) {
-        $path = get_stylesheet_directory();
-    } elseif ( file_exists( get_stylesheet_directory() . '/' . $file ) ) {
-        $path = get_stylesheet_directory() . '/' . $file;
-    } else {
-        $path = get_template_directory() . '/' . $file;
+        $path = $stylesheet_directory;
+    } elseif ( $stylesheet_directory !== $template_directory && file_exists( $stylesheet_directory . '/' . $file ) ) {
+        $path = $stylesheet_directory . '/' . $file;
+    } else {
+        $path = $template_directory . '/' . $file;
     }