Make WordPress Core

Ticket #31130: 31130.4.diff

File 31130.4.diff, 1.4 KB (added by adamsilverstein, 9 years ago)

revert change to load.php in wp_maintenance

  • src/wp-includes/load.php

     
    165165 * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
    166166 */
    167167function wp_maintenance() {
    168         if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
     168        if ( ! file_exists( ABSPATH . '.maintenance' ) || defined( 'WP_INSTALLING' ) )
    169169                return;
    170170
    171171        global $upgrading;
     
    475475 */
    476476function wp_not_installed() {
    477477        if ( is_multisite() ) {
    478                 if ( ! is_blog_installed() && ! wp_installing() ) {
     478                if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
    479479                        nocache_headers();
    480480
    481481                        wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
    482482                }
    483         } elseif ( ! is_blog_installed() && ! wp_installing() ) {
     483        } elseif ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
    484484                nocache_headers();
    485485
    486486                require( ABSPATH . WPINC . '/kses.php' );
     
    539539function wp_get_active_and_valid_plugins() {
    540540        $plugins = array();
    541541        $active_plugins = (array) get_option( 'active_plugins', array() );
    542         if ( empty( $active_plugins ) || wp_installing() )
     542        if ( empty( $active_plugins ) || defined( 'WP_INSTALLING' ) )
    543543                return $plugins;
    544544
    545545        $network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;