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

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@17727 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-04-27 21:16:49 +00:00
parent c491c77f1d
commit ff9610e36d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-settings.php
View File

@ -273,10 +273,12 @@ require( ABSPATH . WPINC . '/locale.php' );
$wp_locale = new WP_Locale(); $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' ) ) {
if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
include( STYLESHEETPATH . '/functions.php' ); include( STYLESHEETPATH . '/functions.php' );
if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
include( TEMPLATEPATH . '/functions.php' ); include( TEMPLATEPATH . '/functions.php' );
}
do_action( 'after_setup_theme' ); do_action( 'after_setup_theme' );