X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fa11948979fd6a4ea5705dc613b239699a459db3..78ff9d91a14da1f53bd3f1ffcab1264d92359b72:/wp-includes/option.php

diff --git a/wp-includes/option.php b/wp-includes/option.php
index cee2451f..ec30231d 100644
--- a/wp-includes/option.php
+++ b/wp-includes/option.php
@@ -236,6 +236,7 @@ function update_option( $option, $value ) {
 
 	$serialized_value = maybe_serialize( $value );
 
+	do_action( 'update_option', $option, $old_value, $value );
 	$result = $wpdb->update( $wpdb->options, array( 'option_value' => $serialized_value ), array( 'option_name' => $option ) );
 	if ( ! $result )
 		return false;
@@ -246,7 +247,6 @@ function update_option( $option, $value ) {
 		wp_cache_set( 'notoptions', $notoptions, 'options' );
 	}
 
-	do_action( 'update_option', $option, $old_value, $value );
 	if ( ! defined( 'WP_INSTALLING' ) ) {
 		$alloptions = wp_load_alloptions();
 		if ( isset( $alloptions[$option] ) ) {
@@ -757,7 +757,8 @@ function get_site_option( $option, $default = false, $use_cache = true ) {
  		return $pre;
 
 	// prevent non-existent options from triggering multiple queries
-	$notoptions = wp_cache_get( 'notoptions', 'site-options' );
+	$notoptions_key = "{$wpdb->siteid}:notoptions";
+	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
 	if ( isset( $notoptions[$option] ) )
 		return apply_filters( 'default_site_option_' . $option, $default );
 
@@ -779,7 +780,7 @@ function get_site_option( $option, $default = false, $use_cache = true ) {
 				wp_cache_set( $cache_key, $value, 'site-options' );
 			} else {
 				$notoptions[$option] = true;
-				wp_cache_set( 'notoptions', $notoptions, 'site-options' );
+				wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
 				$value = apply_filters( 'default_site_option_' . $option, $default );
 			}
 		}
@@ -812,6 +813,7 @@ function add_site_option( $option, $value ) {
 	wp_protect_special_option( $option );
 
 	$value = apply_filters( 'pre_add_site_option_' . $option, $value );
+	$notoptions_key = "{$wpdb->siteid}:notoptions";
 
 	if ( !is_multisite() ) {
 		$result = add_option( $option, $value );
@@ -819,7 +821,7 @@ function add_site_option( $option, $value ) {
 		$cache_key = "{$wpdb->siteid}:$option";
 
 		// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
-		$notoptions = wp_cache_get( 'notoptions', 'site-options' );
+		$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
 		if ( ! is_array( $notoptions ) || ! isset( $notoptions[$option] ) )
 			if ( false !== get_site_option( $option ) )
 				return false;
@@ -835,10 +837,10 @@ function add_site_option( $option, $value ) {
 		wp_cache_set( $cache_key, $value, 'site-options' );
 
 		// This option exists now
-		$notoptions = wp_cache_get( 'notoptions', 'site-options' ); // yes, again... we need it to be fresh
+		$notoptions = wp_cache_get( $notoptions_key, 'site-options' ); // yes, again... we need it to be fresh
 		if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
 			unset( $notoptions[$option] );
-			wp_cache_set( 'notoptions', $notoptions, 'site-options' );
+			wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
 		}
 	}
 
@@ -922,10 +924,11 @@ function update_site_option( $option, $value ) {
 	if ( false === $old_value )
 		return add_site_option( $option, $value );
 
-	$notoptions = wp_cache_get( 'notoptions', 'site-options' );
+	$notoptions_key = "{$wpdb->siteid}:notoptions";
+	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
 	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
 		unset( $notoptions[$option] );
-		wp_cache_set( 'notoptions', $notoptions, 'site-options' );
+		wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
 	}
 
 	if ( !is_multisite() ) {