Ticket #17761: 17761.diff
File 17761.diff, 965 bytes (added by , 13 years ago) |
---|
-
wp-activate.php
1 1 <?php 2 2 define( 'WP_INSTALLING', true ); 3 3 4 define( 'WP_ACTIVATING', true ); 5 4 6 /** Sets up the WordPress Environment. */ 5 7 require( dirname(__FILE__) . '/wp-load.php' ); 6 8 -
wp-settings.php
273 273 $wp_locale = new WP_Locale(); 274 274 275 275 // Load the functions for the active theme, for both parent and child theme if applicable. 276 if ( ! defined( 'WP_INSTALLING' ) ) {276 if ( ! defined( 'WP_INSTALLING' ) || defined( 'WP_ACTIVATING' ) ) { 277 277 if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) 278 278 include( STYLESHEETPATH . '/functions.php' ); 279 279 if ( file_exists( TEMPLATEPATH . '/functions.php' ) )