Browse files

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

…6722

git-svn-id: http://svn.automattic.com/wordpress/trunk@17727 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent c491c77 commit ff9610e36d57b5e632ff88c7790a63592f4d97e9 ryan committed Apr 27, 2011
Showing with 6 additions and 4 deletions.
  1. +6 −4 wp-settings.php
View
10 wp-settings.php
@@ -273,10 +273,12 @@
$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' );

0 comments on commit ff9610e

Please sign in to comment.