Changeset 18662

Timestamp:

09/11/2011 06:53:09 PM (10 years ago)

Author:

nacin

Message:

Allow get_blog_option(null,...) to hit the cache for the current blog. New return values for add_blog_option, update_blog_option, delete_blog_option. Don't set the cache in those functions if add/update/delete_option failed. see #17883.

File:

• trunk/wp-includes/ms-blogs.php (modified) (8 diffs)

trunk/wp-includes/ms-blogs.php

@@ -321 +321 @@
  * @uses apply_filters() Calls 'blog_option_$optionname' with the option name value.
  *
- * @param int $blog_id is the id of the blog.
+ * @param int $blog_id Optional. Blog ID, can be null to refer to the current blog.
  * @param string $setting Name of option to retrieve. Should already be SQL-escaped.
  * @param string $default (optional) Default value returned if option not found.
@@ -328 +328 @@
 function get_blog_option( $blog_id, $setting, $default = false ) {
     global $wpdb;
+
+    if ( null === $blog_id )
+        $blog_id = $wpdb->blogid;
 
     $key = $blog_id . '-' . $setting . '-blog_option';
@@ -381 +384 @@
  * @param string $key The option key
  * @param mixed $value The option value
+ * @return bool True on success, false on failure.
  */
 function add_blog_option( $id, $key, $value ) {
@@ -386 +390 @@
 
     switch_to_blog($id);
-    add_option( $key, $value );
+    $return = add_option( $key, $value );
     restore_current_blog();
-    wp_cache_set( $id . '-' . $key . '-blog_option', $value, 'site-options' );
+    if ( $return )
+        wp_cache_set( $id . '-' . $key . '-blog_option', $value, 'site-options' );
+    return $return;
 }
 
@@ -398 +404 @@
  * @param int $id The blog id
  * @param string $key The option key
+ * @return bool True on success, false on failure.
  */
 function delete_blog_option( $id, $key ) {
@@ -403 +410 @@
 
     switch_to_blog($id);
-    delete_option( $key );
+    $return = delete_option( $key );
     restore_current_blog();
-    wp_cache_set( $id . '-' . $key . '-blog_option', '', 'site-options' );
+    if ( $return )
+        wp_cache_set( $id . '-' . $key . '-blog_option', '', 'site-options' );
+    return $return;
 }
 
@@ -416 +425 @@
  * @param string $key The option key
  * @param mixed $value The option value
+ * @return bool True on success, false on failrue.
  */
 function update_blog_option( $id, $key, $value, $deprecated = null ) {
@@ -424 +434 @@
 
     switch_to_blog($id);
-    update_option( $key, $value );
+    $return = update_option( $key, $value );
     restore_current_blog();
 
     refresh_blog_details( $id );
 
-    wp_cache_set( $id . '-' . $key . '-blog_option', $value, 'site-options');
+    if ( $return )
+        wp_cache_set( $id . '-' . $key . '-blog_option', $value, 'site-options');
+    return $return;
 }