WordPress.org

Make WordPress Core

Changeset 17727


Ignore:
Timestamp:
04/27/11 21:16:49 (3 years ago)
Author:
ryan
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-settings.php

    r17622 r17727  
    274274 
    275275// Load the functions for the active theme, for both parent and child theme if applicable. 
    276 if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) 
    277     include( STYLESHEETPATH . '/functions.php' ); 
    278 if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) 
    279     include( TEMPLATEPATH . '/functions.php' ); 
     276if ( ! defined( 'WP_INSTALLING' ) ) { 
     277    if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) 
     278        include( STYLESHEETPATH . '/functions.php' ); 
     279    if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) 
     280        include( TEMPLATEPATH . '/functions.php' ); 
     281} 
    280282 
    281283do_action( 'after_setup_theme' ); 
Note: See TracChangeset for help on using the changeset viewer.