Make WordPress Core

Changeset 29044


Ignore:
Timestamp:
07/09/2014 06:06:54 PM (10 years ago)
Author:
wonderboymusic
Message:

Revert [28563]. See #18298.

Location:
trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/comment-template.php

    r28976 r29044  
    10641064 *
    10651065 * The $file path is passed through a filter hook called, 'comments_template'
    1066  * which includes the template path and $file combined. Tries the $filtered path
     1066 * which includes the TEMPLATEPATH and $file combined. Tries the $filtered path
    10671067 * first and if it fails it will require the default comment template from the
    10681068 * default theme. If either does not exist, then the WordPress process will be
     
    11491149        define('COMMENTS_TEMPLATE', true);
    11501150
    1151     $theme_template = get_stylesheet_directory() . $file;
     1151    $theme_template = STYLESHEETPATH . $file;
    11521152    /**
    11531153     * Filter the path to the theme template file used for the comments template.
     
    11601160    if ( file_exists( $include ) )
    11611161        require( $include );
    1162     elseif ( file_exists( get_template_directory() . $file ) )
    1163         require( get_template_directory() . $file );
     1162    elseif ( file_exists( TEMPLATEPATH . $file ) )
     1163        require( TEMPLATEPATH . $file );
    11641164    else // Backward compat code will be removed in a future release
    11651165        require( ABSPATH . WPINC . '/theme-compat/comments.php');
  • trunk/src/wp-includes/default-constants.php

    r28674 r29044  
    303303     * Filesystem path to the current active template directory
    304304     * @since 1.5.0
    305      * @deprecated 4.0.0
    306      * @deprecated Use get_template_directory()
    307305     */
    308306    define('TEMPLATEPATH', get_template_directory());
     
    311309     * Filesystem path to the current active template stylesheet directory
    312310     * @since 2.1.0
    313      * @deprecated 4.0.0
    314      * @deprecated Use get_stylesheet_directory()
    315311     */
    316312    define('STYLESHEETPATH', get_stylesheet_directory());
  • trunk/src/wp-includes/template.php

    r28563 r29044  
    450450 * Retrieve the name of the highest priority template file that exists.
    451451 *
    452  * Searches in the stylesheet path before template path so that themes which
     452 * Searches in the STYLESHEETPATH before TEMPLATEPATH so that themes which
    453453 * inherit from a parent theme can just overload one file.
    454454 *
     
    465465        if ( !$template_name )
    466466            continue;
    467         if ( file_exists( get_stylesheet_directory() . '/' . $template_name ) ) {
    468             $located = get_stylesheet_directory() . '/' . $template_name;
     467        if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
     468            $located = STYLESHEETPATH . '/' . $template_name;
    469469            break;
    470         } else if ( file_exists( get_template_directory() . '/' . $template_name ) ) {
    471             $located = get_template_directory() . '/' . $template_name;
     470        } else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
     471            $located = TEMPLATEPATH . '/' . $template_name;
    472472            break;
    473473        }
  • trunk/src/wp-includes/theme.php

    r29025 r29044  
    129129 **/
    130130function is_child_theme() {
    131     return get_template_directory() !== get_stylesheet_directory();
     131    return ( TEMPLATEPATH !== STYLESHEETPATH );
    132132}
    133133
  • trunk/src/wp-settings.php

    r28934 r29044  
    323323// Load the functions for the active theme, for both parent and child theme if applicable.
    324324if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
    325     if ( is_child_theme() && file_exists( get_stylesheet_directory() . '/functions.php' ) ) {
    326         include get_stylesheet_directory() . '/functions.php';
    327     }
    328     if ( file_exists( get_template_directory() . '/functions.php' ) ) {
    329         include get_template_directory() . '/functions.php';
    330     }
     325    if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
     326        include( STYLESHEETPATH . '/functions.php' );
     327    if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
     328        include( TEMPLATEPATH . '/functions.php' );
    331329}
    332330
Note: See TracChangeset for help on using the changeset viewer.