Changeset 2715

Timestamp:

07/16/2005 09:13:14 PM (20 years ago)

Author:

matt

Message:

Check it if matches before serializing, because get_option de-serializes. Hat tip: Donncha.

File:

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

trunk/wp-includes/functions.php

@@ -328 +328 @@
 function update_option($option_name, $newvalue) {
     global $wpdb, $cache_settings;
+
+    $newvalue = trim($newvalue); // I can't think of any situation we wouldn't want to trim
+
+    // If the new and old values are the same, no need to update.
+    if ( $newvalue == get_option($option_name) )
+        return true;
+
     if ( is_array($newvalue) || is_object($newvalue) )
         $newvalue = serialize($newvalue);
-
-    $newvalue = trim($newvalue); // I can't think of any situation we wouldn't want to trim
-
-    // If the new and old values are the same, no need to update.
-    if ($newvalue == get_option($option_name)) {
-        return true;
-    }
 
     // If it's not there add it
@@ -343 +343 @@
 
     $newvalue = $wpdb->escape($newvalue);
+    $option_name = $wpdb->escape( $option_name );
     $wpdb->query("UPDATE $wpdb->options SET option_value = '$newvalue' WHERE option_name = '$option_name'");
     $cache_settings = get_alloptions(); // Re cache settings