Changeset 17727

Timestamp:

04/27/2011 09:16:49 PM (15 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-settings.php (modified) (1 diff)

trunk/wp-settings.php

@@ -274 +274 @@
 
 // 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' );