WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert [28563]. See #18298. 

Built from https://develop.svn.wordpress.org/trunk@29044


git-svn-id: http://core.svn.wordpress.org/trunk@28832 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-07-09 18:07:16 +00:00
parent 2ce53ede8e
commit ef436cb6e0
5 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/comment-template.php
View File

@ -1063,7 +1063,7 @@ function wp_comment_form_unfiltered_html_nonce() {
* and the post ID respectively. * and the post ID respectively.
* *
* The $file path is passed through a filter hook called, 'comments_template' * 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 * 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 * 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. * halted. It is advised for that reason, that the default theme is not deleted.
@ -1148,7 +1148,7 @@ function comments_template( $file = '/comments.php', $separate_comments = false
if ( !defined('COMMENTS_TEMPLATE') ) if ( !defined('COMMENTS_TEMPLATE') )
define('COMMENTS_TEMPLATE', true); 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. * Filter the path to the theme template file used for the comments template.
* *
@ -1159,8 +1159,8 @@ function comments_template( $file = '/comments.php', $separate_comments = false
$include = apply_filters( 'comments_template', $theme_template ); $include = apply_filters( 'comments_template', $theme_template );
if ( file_exists( $include ) ) if ( file_exists( $include ) )
require( $include ); require( $include );
elseif ( file_exists( get_template_directory() . $file ) ) elseif ( file_exists( TEMPLATEPATH . $file ) )
require( get_template_directory() . $file ); require( TEMPLATEPATH . $file );
else // Backward compat code will be removed in a future release else // Backward compat code will be removed in a future release
require( ABSPATH . WPINC . '/theme-compat/comments.php'); require( ABSPATH . WPINC . '/theme-compat/comments.php');
} }

4
wp-includes/default-constants.php
View File

@ -302,16 +302,12 @@ function wp_templating_constants() {
/** /**
* Filesystem path to the current active template directory * Filesystem path to the current active template directory
* @since 1.5.0 * @since 1.5.0
* @deprecated 4.0.0
* @deprecated Use get_template_directory()
*/ */
define('TEMPLATEPATH', get_template_directory()); define('TEMPLATEPATH', get_template_directory());
/** /**
* Filesystem path to the current active template stylesheet directory * Filesystem path to the current active template stylesheet directory
* @since 2.1.0 * @since 2.1.0
* @deprecated 4.0.0
* @deprecated Use get_stylesheet_directory()
*/ */
define('STYLESHEETPATH', get_stylesheet_directory()); define('STYLESHEETPATH', get_stylesheet_directory());

10
wp-includes/template.php
View File

@ -449,7 +449,7 @@ function get_comments_popup_template() {
/** /**
* Retrieve the name of the highest priority template file that exists. * 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. * inherit from a parent theme can just overload one file.
* *
* @since 2.7.0 * @since 2.7.0
@ -464,11 +464,11 @@ function locate_template($template_names, $load = false, $require_once = true )
foreach ( (array) $template_names as $template_name ) { foreach ( (array) $template_names as $template_name ) {
if ( !$template_name ) if ( !$template_name )
continue; continue;
if ( file_exists( get_stylesheet_directory() . '/' . $template_name ) ) { if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
$located = get_stylesheet_directory() . '/' . $template_name; $located = STYLESHEETPATH . '/' . $template_name;
break; break;
} else if ( file_exists( get_template_directory() . '/' . $template_name ) ) { } else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
$located = get_template_directory() . '/' . $template_name; $located = TEMPLATEPATH . '/' . $template_name;
break; break;
} }
} }

2
wp-includes/theme.php
View File

@ -128,7 +128,7 @@ function wp_clean_themes_cache( $clear_update_cache = true ) {
* @return bool true if a child theme is in use, false otherwise. * @return bool true if a child theme is in use, false otherwise.
**/ **/
function is_child_theme() { function is_child_theme() {
return get_template_directory() !== get_stylesheet_directory(); return ( TEMPLATEPATH !== STYLESHEETPATH );
} }
/** /**

10
wp-settings.php
View File

@ -322,12 +322,10 @@ $GLOBALS['wp_locale'] = new WP_Locale();
// Load the functions for the active theme, for both parent and child theme if applicable. // Load the functions for the active theme, for both parent and child theme if applicable.
if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) { if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
if ( is_child_theme() && file_exists( get_stylesheet_directory() . '/functions.php' ) ) { if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
include get_stylesheet_directory() . '/functions.php'; include( STYLESHEETPATH . '/functions.php' );
} if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
if ( file_exists( get_template_directory() . '/functions.php' ) ) { include( TEMPLATEPATH . '/functions.php' );
include get_template_directory() . '/functions.php';
}
} }
/** /**