diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-09-12 09:56:20 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-09-12 09:56:20 +0000 |
| commit | 08c5d92c5e2b3f41b2067a4f18a878eb7a6d461d (patch) | |
| tree | a1bfc6794fd6391ab18cde2be9ab7d5fdb53a8f4 /wp-inst/wp-includes/functions.php | |
| parent | aa61097b2b86ec542ce29cc169f7686f555fb79c (diff) | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@310 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/functions.php')
| -rw-r--r-- | wp-inst/wp-includes/functions.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php index 8d486ff..d730d6a 100644 --- a/wp-inst/wp-includes/functions.php +++ b/wp-inst/wp-includes/functions.php @@ -370,7 +370,12 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false // thx Alex Stapleton, http://alex.vort-x.net/blog/ function add_option($name, $value = '', $description = '', $autoload = 'yes') { - global $wpdb; + global $wpdb, $cache_settings; + + // Make sure the option doesn't already exist + if ( isset($cache_settings->$name) ) + return; + $original = $value; if ( is_array($value) || is_object($value) ) $value = serialize($value); |