Changeset 56635 for trunk/src/wp-includes/comment-template.php

Timestamp:

09/20/2023 05:25:26 PM (13 months ago)

Author:

flixos90

Message:

Themes: Deprecate usage of TEMPLATEPATH and STYLESHEETPATH constants.

While generally the functions get_template_directory() and get_stylesheet_directory() were long recommended to use to get the parent or child theme directory, the TEMPLATEPATH and STYLESHEETPATH constants were still used in a few places in core, most importantly in template related logic.

The remaining usage was problematic as it prevented testability of certain key components of WordPress core.

This changeset replaces all remaining usage with the corresponding functions and effectively marks these constants as deprecated. It also adds test coverage accordingly and even unlocks some existing, previously commented out test coverage to work as expected.

Performance of the new approach has been benchmarked and shows no notable differences. Yet, given that the current theme directories are not expected to change within a regular WordPress page load, the get_template_directory() and get_stylesheet_directory() functions were amended with in-memory caching of the result, unless one of the defining values is being filtered.

Props thekt12, spacedmonkey, mukesh27, aaroncampbell, scribu, lloydbudd, cais, chipbennett, toscho, omarabid, CrazyJaco, DrewAPicture, obenland, wonderboymusic, nacin, helen, dd32, chriscct7, SergeyBiryukov, swissspidy, joemcgill, flixos90.
Fixes #18298.

File:

• trunk/src/wp-includes/comment-template.php (modified) (3 diffs)

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

@@ -1382 +1382 @@
  *
  * The `$file` path is passed through a filter hook called {@see 'comments_template'},
- * which includes the TEMPLATEPATH and $file combined. Tries the $filtered path
+ * which includes the template directory and $file combined. Tries the $filtered path
  * first and if it fails it will require the default comment template from the
  * default theme. If either does not exist, then the WordPress process will be
@@ -1601 +1601 @@
     }
 
-    $theme_template = STYLESHEETPATH . $file;
+    $stylesheet_path = get_stylesheet_directory();
+    $template_path   = get_template_directory();
+
+    $theme_template = $stylesheet_path . $file;
 
     /**
@@ -1614 +1617 @@
     if ( file_exists( $include ) ) {
         require $include;
-    } elseif ( file_exists( TEMPLATEPATH . $file ) ) {
-        require TEMPLATEPATH . $file;
+    } elseif ( file_exists( $template_path . $file ) ) {
+        require $template_path . $file;
     } else { // Backward compat code will be removed in a future release.
         require ABSPATH . WPINC . '/theme-compat/comments.php';