Changeset 14193

Timestamp:

04/23/2010 02:25:05 PM (10 years ago)

Author:

ryan

Message:

Bring back delete on empty value for update_user_option() to preserve back compat. Switch to delete_user_option() in core. Props mdawaffe. fixes #13088

Location:

trunk

Files:

• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)

trunk/wp-admin/includes/upgrade.php

@@ -1111 +1111 @@
     if ( $wp_current_db_version < 14139 ) {
         populate_roles_300();
-        if ( is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
+        if ( is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get1_site_option( 'siteurl' ) === false )
             add_site_option( 'siteurl', '' );
     }

trunk/wp-includes/ms-functions.php

@@ -787 +787 @@
 
     // Newly created users have no roles or caps until they are added to a blog.
-    update_user_option($user_id, 'capabilities', '');
-    update_user_option($user_id, 'user_level', '');
+    delete_user_option( $user_id, 'capabilities' );
+    delete_user_option( $user_id, 'user_level' );
 
     do_action( 'wpmu_new_user', $user_id );

trunk/wp-includes/user.php

@@ -259 +259 @@
  * it will prepend the WordPress table prefix to the option name.
  *
+ * Deletes the user option if $newvalue is empty.
+ *
  * @since 2.0.0
  * @uses $wpdb WordPress database object for queries
@@ -273 +275 @@
     if ( !$global )
         $option_name = $wpdb->prefix . $option_name;
+
+    // For backward compatibility.  See differences between update_user_meta() and deprecated update_user_meta().
+    // http://core.trac.wordpress.org/ticket/13088
+    if ( is_null( $newvalue ) || is_scalar( $newvalue ) && empty( $newvalue ) )
+        return delete_user_meta( $user_id, $option_name );
+
     return update_user_meta( $user_id, $option_name, $newvalue );
 }