Changeset 14193 for trunk/wp-includes/user.php

Timestamp:

04/23/2010 02:25:05 PM (16 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

File:

• trunk/wp-includes/user.php (modified) (2 diffs)

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