WordPress.org

Make WordPress Core

Ticket #16722: 16722.diff

File 16722.diff, 882 bytes (added by greuben, 5 years ago)
  • wp-settings.php

     
    273273$wp_locale =& new WP_Locale(); 
    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' ); 
    282284