Changeset 18588

Timestamp:

08/23/2011 08:45:48 PM (15 years ago)

Author:

duck_

Message:

Use get_site_option in add/update_site_option for caching and filtering benefits. fixes #18478

File:

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

trunk/wp-includes/functions.php

@@ -3800 +3800 @@
         $cache_key = "{$wpdb->siteid}:$option";
 
-        if ( $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) ) )
+        if ( false !== get_site_option( $option ) )
             return false;
 
@@ -3807 +3807 @@
 
         $_value = $value;
-        $value = maybe_serialize($value);
+        $value = maybe_serialize( $value );
         $result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $value ) );
         $value = $_value;
@@ -3887 +3887 @@
         return false;
 
+    if ( $value && false === $oldvalue )
+        return add_site_option( $option, $value );
+
     if ( !is_multisite() ) {
         $result = update_option( $option, $value );
     } else {
+        $value = sanitize_option( $option, $value );
         $cache_key = "{$wpdb->siteid}:$option";
-
-        if ( $value && !$wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) ) )
-            return add_site_option( $option, $value );
-        $value = sanitize_option( $option, $value );
         wp_cache_set( $cache_key, $value, 'site-options' );