Changeset 29044

Timestamp:

07/09/2014 06:06:54 PM (11 years ago)

Author:

wonderboymusic

Message:

Revert [28563]. See #18298.

Location:

trunk/src

Files:

• wp-includes/comment-template.php (modified) (3 diffs)
• wp-includes/default-constants.php (modified) (2 diffs)
• wp-includes/template.php (modified) (2 diffs)
• wp-includes/theme.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

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

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

trunk/src/wp-includes/default-constants.php

@@ -303 +303 @@
      * Filesystem path to the current active template directory
      * @since 1.5.0
-     * @deprecated 4.0.0
-     * @deprecated Use get_template_directory()
      */
     define('TEMPLATEPATH', get_template_directory());
@@ -311 +309 @@
      * Filesystem path to the current active template stylesheet directory
      * @since 2.1.0
-     * @deprecated 4.0.0
-     * @deprecated Use get_stylesheet_directory()
      */
     define('STYLESHEETPATH', get_stylesheet_directory());

trunk/src/wp-includes/template.php

@@ -450 +450 @@
  * Retrieve the name of the highest priority template file that exists.
  *
- * Searches in the stylesheet path before template path so that themes which
+ * Searches in the STYLESHEETPATH before TEMPLATEPATH so that themes which
  * inherit from a parent theme can just overload one file.
  *
@@ -465 +465 @@
         if ( !$template_name )
             continue;
-        if ( file_exists( get_stylesheet_directory() . '/' . $template_name ) ) {
-            $located = get_stylesheet_directory() . '/' . $template_name;
+        if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
+            $located = STYLESHEETPATH . '/' . $template_name;
             break;
-        } else if ( file_exists( get_template_directory() . '/' . $template_name ) ) {
-            $located = get_template_directory() . '/' . $template_name;
+        } else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
+            $located = TEMPLATEPATH . '/' . $template_name;
             break;
         }

trunk/src/wp-includes/theme.php

@@ -129 +129 @@
  **/
 function is_child_theme() {
-    return get_template_directory() !== get_stylesheet_directory();
+    return ( TEMPLATEPATH !== STYLESHEETPATH );
 }
 

trunk/src/wp-settings.php

@@ -323 +323 @@
 // Load the functions for the active theme, for both parent and child theme if applicable.
 if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
-    if ( is_child_theme() && 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';
-    }
+    if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
+        include( STYLESHEETPATH . '/functions.php' );
+    if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
+        include( TEMPLATEPATH . '/functions.php' );
 }