Ticket #24933: 24933.2.diff

src/wp-includes/meta.php

@@ -151 +151 @@
         if ( 'post' == $meta_type )
                 do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
 
-        $wpdb->update( $table, $data, $where );
+        $result = $wpdb->update( $table, $data, $where );
+        if ( ! $result )
+                return false;
 
         wp_cache_delete($object_id, $meta_type . '_meta');
 
@@ -435 +437 @@
                         do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
 
                 // Run the update query, all fields in $data are %s, $where is a %d.
-                $result = (bool) $wpdb->update( $table, $data, $where, '%s', '%d' );
+                $result = $wpdb->update( $table, $data, $where, '%s', '%d' );
+                if ( ! $result )
+                        return false;
 
                 // Clear the caches.
                 wp_cache_delete($object_id, $meta_type . '_meta');
@@ -445 +449 @@
                 if ( 'post' == $meta_type )
                         do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
 
-                return $result;
+                return true;
         }
 
         // And if the meta was not found.

src/wp-includes/option.php

@@ -234 +234 @@
         if ( false === $oldvalue )
                 return add_option( $option, $newvalue );
 
+        $_newvalue = maybe_serialize( $newvalue );
+
+        $result = $wpdb->update( $wpdb->options, array( 'option_value' => $_newvalue ), array( 'option_name' => $option ) );
+        if ( ! $result )
+                return false;
+
         $notoptions = wp_cache_get( 'notoptions', 'options' );
         if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
                 unset( $notoptions[$option] );
                 wp_cache_set( 'notoptions', $notoptions, 'options' );
         }
 
-        $_newvalue = $newvalue;
-        $newvalue = maybe_serialize( $newvalue );
-
-        do_action( 'update_option', $option, $oldvalue, $_newvalue );
+        do_action( 'update_option', $option, $oldvalue, $newvalue );
         if ( ! defined( 'WP_INSTALLING' ) ) {
                 $alloptions = wp_load_alloptions();
                 if ( isset( $alloptions[$option] ) ) {
-                        $alloptions[$option] = $newvalue;
+                        $alloptions[$option] = $_newvalue;
                         wp_cache_set( 'alloptions', $alloptions, 'options' );
                 } else {
-                        wp_cache_set( $option, $newvalue, 'options' );
+                        wp_cache_set( $option, $_newvalue, 'options' );
                 }
         }
 
-        $result = $wpdb->update( $wpdb->options, array( 'option_value' => $newvalue ), array( 'option_name' => $option ) );
-
-        if ( $result ) {
-                do_action( "update_option_{$option}", $oldvalue, $_newvalue );
-                do_action( 'updated_option', $option, $oldvalue, $_newvalue );
-                return true;
-        }
-        return false;
+        do_action( "update_option_{$option}", $oldvalue, $newvalue );
+        do_action( 'updated_option', $option, $oldvalue, $newvalue );
+        return true;
 }
 
 /**
@@ -312 +310 @@
                 if ( false !== get_option( $option ) )
                         return false;
 
-        $_value = $value;
-        $value = maybe_serialize( $value );
+        $_value = maybe_serialize( $value );
         $autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
-        do_action( 'add_option', $option, $_value );
+        do_action( 'add_option', $option, $value );
+
+        $result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $_value, $autoload ) );
+        if ( ! $result )
+                return false;
+
         if ( ! defined( 'WP_INSTALLING' ) ) {
                 if ( 'yes' == $autoload ) {
                         $alloptions = wp_load_alloptions();
-                        $alloptions[$option] = $value;
+                        $alloptions[$option] = $_value;
                         wp_cache_set( 'alloptions', $alloptions, 'options' );
                 } else {
-                        wp_cache_set( $option, $value, 'options' );
+                        wp_cache_set( $option, $_value, 'options' );
                 }
         }
 
@@ -333 +335 @@
                 wp_cache_set( 'notoptions', $notoptions, 'options' );
         }
 
-        $result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $value, $autoload ) );
-
-        if ( $result ) {
-                do_action( "add_option_{$option}", $option, $_value );
-                do_action( 'added_option', $option, $_value );
-                return true;
-        }
-        return false;
+        do_action( "add_option_{$option}", $option, $value );
+        do_action( 'added_option', $option, $value );
+        return true;
 }
 
 /**
@@ -829 +826 @@
 
                 $value = sanitize_option( $option, $value );
 
+                $_value = maybe_serialize( $value );
+                $result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $_value ) );
+
+                if ( ! $result )
+                        return false;
+
                 wp_cache_set( $cache_key, $value, 'site-options' );
 
-                $_value = $value;
-                $value = maybe_serialize( $value );
-                $result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $value ) );
-                $value = $_value;
-
                 // This option exists now
                 $notoptions = wp_cache_get( 'notoptions', 'site-options' ); // yes, again... we need it to be fresh
                 if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
@@ -934 +932 @@
                 $result = update_option( $option, $value );
         } else {
                 $value = sanitize_option( $option, $value );
-                $cache_key = "{$wpdb->siteid}:$option";
-                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;
+                $_value = maybe_serialize( $value );
+                $result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $_value ), array( 'site_id' => $wpdb->siteid, 'meta_key' => $option ) );
+
+                if ( $result ) {
+                        $cache_key = "{$wpdb->siteid}:$option";
+                        wp_cache_set( $cache_key, $value, 'site-options' );
+                }
         }
 
         if ( $result ) {