WordPress.org

Make WordPress Core

Ticket #17761: 17761.diff

File 17761.diff, 965 bytes (added by nacin, 7 years ago)
  • wp-activate.php

     
    11<?php
    22define( 'WP_INSTALLING', true );
    33
     4define( 'WP_ACTIVATING', true );
     5
    46/** Sets up the WordPress Environment. */
    57require( dirname(__FILE__) . '/wp-load.php' );
    68
  • 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 ( ! defined( 'WP_INSTALLING' ) ) {
     276if ( ! defined( 'WP_INSTALLING' ) || defined( 'WP_ACTIVATING' ) ) {
    277277        if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
    278278                include( STYLESHEETPATH . '/functions.php' );
    279279        if ( file_exists( TEMPLATEPATH . '/functions.php' ) )