Ticket #18298: 18298.diff

wp-includes/theme.php

@@ -14 +14 @@
  * @return bool true if a child theme is in use, false otherwise.
  **/
 function is_child_theme() {
-        return ( TEMPLATEPATH !== STYLESHEETPATH );
+        return ( get_template_directory() !== get_stylesheet_directory() );
 }
 
 /**
@@ -1062 +1062 @@
 /**
  * Retrieve the name of the highest priority template file that exists.
  *
- * Searches in the STYLESHEETPATH before TEMPLATEPATH so that themes which
+ * Searches in the stylesheet path before template path so that themes which
  * inherit from a parent theme can just overload one file.
  *
  * @since 2.7.0
@@ -1077 +1077 @@
         foreach ( (array) $template_names as $template_name ) {
                 if ( !$template_name )
                         continue;
-                if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
-                        $located = STYLESHEETPATH . '/' . $template_name;
+                if ( file_exists(get_stylesheet_directory() . '/' . $template_name)) {
+                        $located = get_stylesheet_directory() . '/' . $template_name;
                         break;
-                } else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
-                        $located = TEMPLATEPATH . '/' . $template_name;
+                } else if ( file_exists(get_template_directory() . '/' . $template_name) ) {
+                        $located = get_template_directory() . '/' . $template_name;
                         break;
                 }
         }

wp-includes/comment-template.php

@@ -831 +831 @@
  * and the post ID respectively.
  *
  * 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 themplate from the
  * default theme. If either does not exist, then the WordPress process will be
  * halted. It is advised for that reason, that the default theme is not deleted.
@@ -908 +908 @@
         if ( !defined('COMMENTS_TEMPLATE') || !COMMENTS_TEMPLATE)
                 define('COMMENTS_TEMPLATE', true);
 
-        $include = apply_filters('comments_template', STYLESHEETPATH . $file );
+        $include = apply_filters('comments_template', get_stylesheet_directory() . $file );
         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');
 }

wp-settings.php

@@ -278 +278 @@
 
 // Load the functions for the active theme, for both parent and child theme if applicable.
 if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
-        if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
-                include( STYLESHEETPATH . '/functions.php' );
-        if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
-                include( TEMPLATEPATH . '/functions.php' );
+        if ( get_template_directory() !== get_stylesheet_directory() && file_exists( get_stylesheet_directory() . '/functions.php' ) )
+                include( get_stylesheet_directory() . '/functions.php' );
+        if ( file_exists( get_template_directory() . '/functions.php' ) )
+                include( get_template_directory() . '/functions.php' );
 }
 
 do_action( 'after_setup_theme' );