vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Add `@deprecated` annotations to `TEMPLATEPATH` and `STYLESHEETPATH` definitions.

Props obenland, aaroncampbell. 
Fixes #18298.


git-svn-id: https://develop.svn.wordpress.org/trunk@28563 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2014-05-23 20:11:08 +00:00
parent e2a124a911
commit 70f735669a
5 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-settings.php
+6 -4
View File
@@ -322,10 +322,12 @@ $GLOBALS['wp_locale'] = new WP_Locale();
// 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 ( 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';
}
}
/**