Changeset 12973 for trunk/wp-includes/functions.php

Timestamp:

02/05/2010 05:59:24 PM (15 years ago)

Author:

wpmuguru

Message:

Reduce DB queries by half during MU signup, props donncha, see #12140

File:

• trunk/wp-includes/functions.php (modified) (6 diffs)

trunk/wp-includes/functions.php

@@ -336 +336 @@
     }
 
-    $alloptions = wp_load_alloptions();
+    if ( ! defined( 'WP_INSTALLING' ) ) {
+        $alloptions = wp_load_alloptions();
+    }
 
     if ( isset( $alloptions[$setting] ) ) {
@@ -496 +498 @@
 
     do_action( 'update_option', $option_name, $oldvalue, $newvalue );
-    $alloptions = wp_load_alloptions();
-    if ( isset( $alloptions[$option_name] ) ) {
-        $alloptions[$option_name] = $newvalue;
-        wp_cache_set( 'alloptions', $alloptions, 'options' );
-    } else {
-        wp_cache_set( $option_name, $newvalue, 'options' );
+    if ( ! defined( 'WP_INSTALLING' ) ) {
+        $alloptions = wp_load_alloptions();
+        if ( isset( $alloptions[$option_name] ) ) {
+            $alloptions[$option_name] = $newvalue;
+            wp_cache_set( 'alloptions', $alloptions, 'options' );
+        } else {
+            wp_cache_set( $option_name, $newvalue, 'options' );
+        }
     }
 
@@ -561 +565 @@
     $autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
     do_action( 'add_option', $name, $value );
-    if ( 'yes' == $autoload ) {
-        $alloptions = wp_load_alloptions();
-        $alloptions[$name] = $value;
-        wp_cache_set( 'alloptions', $alloptions, 'options' );
-    } else {
-        wp_cache_set( $name, $value, 'options' );
+    if ( ! defined( 'WP_INSTALLING' ) ) {
+        if ( 'yes' == $autoload ) {
+            $alloptions = wp_load_alloptions();
+            $alloptions[$name] = $value;
+            wp_cache_set( 'alloptions', $alloptions, 'options' );
+        } else {
+            wp_cache_set( $name, $value, 'options' );
+        }
     }
 
@@ -607 +613 @@
     // expected_slashed ($name)
     $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name = '$name'" );
-    if ( 'yes' == $option->autoload ) {
-        $alloptions = wp_load_alloptions();
-        if ( isset( $alloptions[$name] ) ) {
-            unset( $alloptions[$name] );
-            wp_cache_set( 'alloptions', $alloptions, 'options' );
+    if ( ! defined( 'WP_INSTALLING' ) ) {
+        if ( 'yes' == $option->autoload ) {
+            $alloptions = wp_load_alloptions();
+            if ( isset( $alloptions[$name] ) ) {
+                unset( $alloptions[$name] );
+                wp_cache_set( 'alloptions', $alloptions, 'options' );
+            }
+        } else {
+            wp_cache_delete( $name, 'options' );
         }
-    } else {
-        wp_cache_delete( $name, 'options' );
     }
     do_action( 'deleted_option', $name );
@@ -666 +674 @@
         $value = wp_cache_get($transient, 'transient');
     } else {
-        $transient_option = '_transient_' . esc_sql($transient);
-        // If option is not in alloptions, it is not autoloaded and thus has a timeout
-        $alloptions = wp_load_alloptions();
-        if ( !isset( $alloptions[$transient_option] ) ) {
-            $transient_timeout = '_transient_timeout_' . esc_sql($transient);
-            if ( get_option($transient_timeout) < time() ) {
-                delete_option($transient_option);
-                delete_option($transient_timeout);
-                return false;
+        if ( ! defined( 'WP_INSTALLING' ) ) {
+            $transient_option = '_transient_' . esc_sql($transient);
+            // If option is not in alloptions, it is not autoloaded and thus has a timeout
+            $alloptions = wp_load_alloptions();
+            if ( !isset( $alloptions[$transient_option] ) ) {
+                $transient_timeout = '_transient_timeout_' . esc_sql($transient);
+                if ( get_option($transient_timeout) < time() ) {
+                    delete_option($transient_option);
+                    delete_option($transient_timeout);
+                    return false;
+                }
             }
         }
@@ -1743 +1753 @@
 
     $suppress = $wpdb->suppress_errors();
-    $alloptions = wp_load_alloptions();
+    if ( ! defined( 'WP_INSTALLING' ) ) {
+        $alloptions = wp_load_alloptions();
+    }
     // If siteurl is not set to autoload, check it specifically
     if ( !isset( $alloptions['siteurl'] ) )