From 66643f61c7fd314f1f0eda2209c7971381e6f709 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Fri, 11 Nov 2005 02:24:09 +0000 Subject: [PATCH] Don't use hard query. Remove unneeded line. fixes #1858 git-svn-id: https://develop.svn.wordpress.org/trunk@3052 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/functions.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 1710fe20d4..0f7ce6e106 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -340,16 +340,18 @@ function update_option($option_name, $newvalue) { $newvalue = trim($newvalue); // If the new and old values are the same, no need to update. - if ( $newvalue == get_option($option_name) ) + $oldvalue = get_option($option_name); + if ( $newvalue == $oldvalue ) return true; + if ( false === $oldvalue ) { + add_option($option_name, $newvalue); + return true; + } + if ( is_array($newvalue) || is_object($newvalue) ) $newvalue = serialize($newvalue); - // If it's not there add it - if ( !$wpdb->get_var("SELECT option_name FROM $wpdb->options WHERE option_name = '$option_name'") ) - add_option($option_name, $newvalue); - wp_cache_set($option_name, $newvalue, 'options'); $newvalue = $wpdb->escape($newvalue); @@ -373,7 +375,6 @@ function add_option($name, $value = '', $description = '', $autoload = 'yes') { if ( false !== get_option($name) ) return; - $original = $value; if ( is_array($value) || is_object($value) ) $value = serialize($value);