Changeset 13433

Timestamp:

02/26/2010 06:51:37 PM (15 years ago)

Author:

nacin

Message:

Consistently pass unserialized values to hooks in update_site_option(). Change add_option() and add_site_option() to do the same. Any plugin using maybe_unserialize() would continue to work as the value would no longer need to be unserialized. fixes #10788

File:

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

trunk/wp-includes/functions.php

@@ -577 +577 @@
             return;
 
+    $_value = $value;
     $value = maybe_serialize( $value );
     $autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
@@ -600 +601 @@
 
     if ( $result ) {
-        do_action( "add_option_{$option}", $option, $value );
-        do_action( 'added_option', $option, $value );
+        do_action( "add_option_{$option}", $option, $_value );
+        do_action( 'added_option', $option, $_value );
         return true;
     }
@@ -3445 +3446 @@
         wp_cache_set( $cache_key, $value, 'site-options' );
 
+        $_value = $value;
         $value = maybe_serialize($value);
 
@@ -3450 +3452 @@
     }
 
-    do_action( "add_site_option_{$option}", $option, $value );
-    do_action( "add_site_option", $option, $value );
+    do_action( "add_site_option_{$option}", $option, $_value );
+    do_action( "add_site_option", $option, $_value );
 
     return $result;
@@ -3533 +3535 @@
         wp_cache_set( $cache_key, $value, 'site-options' );
 
+        $_value = $value;
         $value = maybe_serialize( $value );
         $result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $value ), array( 'site_id' => $wpdb->siteid, 'meta_key' => $option ) );
+        $value = $_value;
     }