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

Timestamp:

05/23/2014 08:11:08 PM (10 years ago)

Author:

wonderboymusic

Message:

Replaces all uses of TEMPLATEPATH and STYLESHEETPATH in core with get_template_directory() and get_stylesheet_directory().

Add @deprecated annotations to TEMPLATEPATH and STYLESHEETPATH definitions.

Props obenland, aaroncampbell.
Fixes #18298.

File:

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

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

@@ -1050 +1050 @@
  *
  * The $file path is passed through a filter hook called, 'comments_template'
- * which includes the TEMPLATEPATH and $file combined. Tries the $filtered path
+ * which includes the template path 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
@@ -1135 +1135 @@
         define('COMMENTS_TEMPLATE', true);
 
-    $theme_template = STYLESHEETPATH . $file;
+    $theme_template = get_stylesheet_directory() . $file;
     /**
      * Filter the path to the theme template file used for the comments template.
@@ -1146 +1146 @@
     if ( file_exists( $include ) )
         require( $include );
-    elseif ( file_exists( TEMPLATEPATH . $file ) )
-        require( TEMPLATEPATH . $file );
+    elseif ( file_exists( get_template_directory() . $file ) )
+        require( get_template_directory() . $file );
     else // Backward compat code will be removed in a future release
         require( ABSPATH . WPINC . '/theme-compat/comments.php');