WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use hard query. Remove unneeded line. fixes #1858 

git-svn-id: http://svn.automattic.com/wordpress/trunk@3052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2005-11-11 02:24:09 +00:00
parent 815bd99a96
commit 0c2c997bab
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/functions.php
View File

@ -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);