Ticket #31130: 31130.4.diff

src/wp-includes/load.php

@@ -165 +165 @@
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-        if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
+        if ( ! file_exists( ABSPATH . '.maintenance' ) || defined( 'WP_INSTALLING' ) )
                 return;
 
         global $upgrading;
@@ -475 +475 @@
  */
 function wp_not_installed() {
         if ( is_multisite() ) {
-                if ( ! is_blog_installed() && ! wp_installing() ) {
+                if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
                         nocache_headers();
 
                         wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
                 }
-        } elseif ( ! is_blog_installed() && ! wp_installing() ) {
+        } elseif ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
                 nocache_headers();
 
                 require( ABSPATH . WPINC . '/kses.php' );
@@ -539 +539 @@
 function wp_get_active_and_valid_plugins() {
         $plugins = array();
         $active_plugins = (array) get_option( 'active_plugins', array() );
-        if ( empty( $active_plugins ) || wp_installing() )
+        if ( empty( $active_plugins ) || defined( 'WP_INSTALLING' ) )
                 return $plugins;
 
         $network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;