vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert [28563]. See #18298.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@29044 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2014-07-09 18:06:54 +00:00
parent bdeb3348ed
commit 3cda5caafd
5 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/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.
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' );
}
/**