Changeset 18587

Timestamp:

08/23/2011 08:24:35 PM (13 years ago)

Author:

duck_

Message:

add_site_option should not update existing options, should return a boolean and should only run actions on success. fixes #18422

File:

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

trunk/wp-includes/functions.php

@@ -570 +570 @@
  * resources can not be serialized or added as an option.
  *
- * You can create options without values and then add values later. Does not
- * check whether the option has already been added, but does check that you
+ * You can create options without values and then update the values later.
+ * Existing options will not be updated and checks are performed to ensure that you
  * aren't adding a protected WordPress option. Care should be taken to not name
- * options the same as the ones which are protected and to not add options
- * that were already added.
+ * options the same as the ones which are protected.
  *
  * @package WordPress
@@ -3776 +3775 @@
  * Add a new site option.
  *
+ * Existing options will not be updated. Note that prior to 3.3 this wasn't the case.
+ *
  * @see add_option()
  * @package WordPress
@@ -3800 +3801 @@
 
         if ( $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) ) )
-            return update_site_option( $option, $value );
+            return false;
 
         $value = sanitize_option( $option, $value );
@@ -3811 +3812 @@
     }
 
-    do_action( "add_site_option_{$option}", $option, $value );
-    do_action( "add_site_option", $option, $value );
-
-    return $result;
+    if ( $result ) {
+        do_action( "add_site_option_{$option}", $option, $value );
+        do_action( "add_site_option", $option, $value );
+        return true;
+    }
+    return false;
 }