<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14193] trunk: Bring back delete on empty value for update_user_option()
to preserve back compat.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14193">14193</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-04-23 14:25:05 +0000 (Fri, 23 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bring back delete on empty value for update_user_option() to preserve back compat. Switch to delete_user_option() in core. Props mdawaffe. fixes <a href="http://trac.wordpress.org/ticket/13088">#13088</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-04-23 06:05:07 UTC (rev 14192)
+++ trunk/wp-admin/includes/upgrade.php 2010-04-23 14:25:05 UTC (rev 14193)
</span><span class="lines">@@ -1110,7 +1110,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $wp_current_db_version < 14139 ) {
</span><span class="cx"> populate_roles_300();
</span><del>- if ( is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
</del><ins>+ if ( is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get1_site_option( 'siteurl' ) === false )
</ins><span class="cx"> add_site_option( 'siteurl', '' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-04-23 06:05:07 UTC (rev 14192)
+++ trunk/wp-includes/ms-functions.php 2010-04-23 14:25:05 UTC (rev 14193)
</span><span class="lines">@@ -786,8 +786,8 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Newly created users have no roles or caps until they are added to a blog.
</span><del>- update_user_option($user_id, 'capabilities', '');
- update_user_option($user_id, 'user_level', '');
</del><ins>+ delete_user_option( $user_id, 'capabilities' );
+ delete_user_option( $user_id, 'user_level' );
</ins><span class="cx">
</span><span class="cx"> do_action( 'wpmu_new_user', $user_id );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (14192 => 14193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-04-23 06:05:07 UTC (rev 14192)
+++ trunk/wp-includes/user.php 2010-04-23 14:25:05 UTC (rev 14193)
</span><span class="lines">@@ -258,6 +258,8 @@
</span><span class="cx"> * global blog options. If the 'global' parameter is false, which it is by default
</span><span class="cx"> * it will prepend the WordPress table prefix to the option name.
</span><span class="cx"> *
</span><ins>+ * Deletes the user option if $newvalue is empty.
+ *
</ins><span class="cx"> * @since 2.0.0
</span><span class="cx"> * @uses $wpdb WordPress database object for queries
</span><span class="cx"> *
</span><span class="lines">@@ -272,6 +274,12 @@
</span><span class="cx">
</span><span class="cx"> if ( !$global )
</span><span class="cx"> $option_name = $wpdb->prefix . $option_name;
</span><ins>+
+ // 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 );
+
</ins><span class="cx"> return update_user_meta( $user_id, $option_name, $newvalue );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>