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
This commit is contained in:
parent
9019babb19
commit
66643f61c7
|
@ -340,16 +340,18 @@ function update_option($option_name, $newvalue) {
|
||||||
$newvalue = trim($newvalue);
|
$newvalue = trim($newvalue);
|
||||||
|
|
||||||
// If the new and old values are the same, no need to update.
|
// 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;
|
return true;
|
||||||
|
|
||||||
|
if ( false === $oldvalue ) {
|
||||||
|
add_option($option_name, $newvalue);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
if ( is_array($newvalue) || is_object($newvalue) )
|
if ( is_array($newvalue) || is_object($newvalue) )
|
||||||
$newvalue = serialize($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');
|
wp_cache_set($option_name, $newvalue, 'options');
|
||||||
|
|
||||||
$newvalue = $wpdb->escape($newvalue);
|
$newvalue = $wpdb->escape($newvalue);
|
||||||
|
@ -373,7 +375,6 @@ function add_option($name, $value = '', $description = '', $autoload = 'yes') {
|
||||||
if ( false !== get_option($name) )
|
if ( false !== get_option($name) )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
$original = $value;
|
|
||||||
if ( is_array($value) || is_object($value) )
|
if ( is_array($value) || is_object($value) )
|
||||||
$value = serialize($value);
|
$value = serialize($value);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue