Changeset 34828 for trunk/src/wp-includes/option.php

Timestamp:

10/05/2015 03:05:26 PM (8 years ago)

Author:

boonebgorges

Message:

Use wp_installing() instead of WP_INSTALLING constant.

The WP_INSTALLING constant is a flag that WordPress sets in a number of
places, telling the system that options should be fetched directly from the
database instead of from the cache, that WP should not ping wordpress.org for
updates, that the normal "not installed" checks should be bypassed, and so on.

A constant is generally necessary for this purpose, because the flag is
typically set before the WP bootstrap, meaning that WP functions are not yet
available. However, it is possible - notably, during wpmu_create_blog() -
for the "installing" flag to be set after WP has already loaded. In these
cases, WP_INSTALLING would be set for the remainder of the process, since
there's no way to change a constant once it's defined. This, in turn, polluted
later function calls that ought to have been outside the scope of site
creation, particularly the non-caching of option data. The problem was
particularly evident in the case of the automated tests, where WP_INSTALLING
was set the first time a site was created, and remained set for the rest of the
suite.

The new wp_installing() function allows developers to fetch the current
installation status (when called without any arguments) or to set the
installation status (when called with a boolean true or false). Use of
the WP_INSTALLING constant is still supported; wp_installing() will default
to true if the constant is defined during the bootstrap.

Props boonebgorges, jeremyfelt.
See #31130.

File:

• trunk/src/wp-includes/option.php (modified) (8 diffs)

trunk/src/wp-includes/option.php

@@ -54 +54 @@
         return false;
 
-    if ( ! defined( 'WP_INSTALLING' ) ) {
+    if ( ! wp_installing() ) {
         // prevent non-existent options from triggering multiple queries
         $notoptions = wp_cache_get( 'notoptions', 'options' );
@@ -172 +172 @@
     global $wpdb;
 
-    if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
+    if ( ! wp_installing() || ! is_multisite() )
         $alloptions = wp_cache_get( 'alloptions', 'options' );
     else
@@ -186 +186 @@
             $alloptions[$o->option_name] = $o->option_value;
         }
-        if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
+        if ( ! wp_installing() || ! is_multisite() )
             wp_cache_add( 'alloptions', $alloptions, 'options' );
     }
@@ -205 +205 @@
     global $wpdb;
 
-    if ( !is_multisite() || wp_using_ext_object_cache() || defined( 'WP_INSTALLING' ) )
+    if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() )
         return;
 
@@ -333 +333 @@
     }
 
-    if ( ! defined( 'WP_INSTALLING' ) ) {
+    if ( ! wp_installing() ) {
         $alloptions = wp_load_alloptions();
         if ( isset( $alloptions[$option] ) ) {
@@ -434 +434 @@
         return false;
 
-    if ( ! defined( 'WP_INSTALLING' ) ) {
+    if ( ! wp_installing() ) {
         if ( 'yes' == $autoload ) {
             $alloptions = wp_load_alloptions();
@@ -510 +510 @@
 
     $result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) );
-    if ( ! defined( 'WP_INSTALLING' ) ) {
+    if ( ! wp_installing() ) {
         if ( 'yes' == $row->autoload ) {
             $alloptions = wp_load_alloptions();
@@ -630 +630 @@
     } else {
         $transient_option = '_transient_' . $transient;
-        if ( ! defined( 'WP_INSTALLING' ) ) {
+        if ( ! wp_installing() ) {
             // If option is not in alloptions, it is not autoloaded and thus has a timeout
             $alloptions = wp_load_alloptions();