Don't load themes functions.php for upgrades. Props greuben. fixes #16722

git-svn-id: https://develop.svn.wordpress.org/trunk@17727 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2011-04-27 21:16:49 +00:00
parent 5ff6ec04cb
commit 28f4e4a534

View File

@ -273,10 +273,12 @@ require( ABSPATH . WPINC . '/locale.php' );
$wp_locale = new WP_Locale();
// Load the functions for the active theme, for both parent and child theme if applicable.
if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
include( STYLESHEETPATH . '/functions.php' );
if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
include( TEMPLATEPATH . '/functions.php' );
if ( ! defined( 'WP_INSTALLING' ) ) {
if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
include( STYLESHEETPATH . '/functions.php' );
if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
include( TEMPLATEPATH . '/functions.php' );
}
do_action( 'after_setup_theme' );