<!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>[13326] trunk/wp-includes: Ensure we'
re back compat with return values and actions in deprecated *_usermeta()
family.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13326">13326</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-23 09:15:47 +0000 (Tue, 23 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure we're back compat with return values and actions in deprecated *_usermeta() family. See <a href="http://trac.wordpress.org/ticket/10837">#10837</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (13325 => 13326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2010-02-23 09:08:50 UTC (rev 13325)
+++ trunk/wp-includes/deprecated.php 2010-02-23 09:15:47 UTC (rev 13326)
</span><span class="lines">@@ -2281,7 +2281,31 @@
</span><span class="cx"> */
</span><span class="cx"> function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.0', 'delete_user_meta()' );
</span><del>- return delete_user_meta( $user_id, $meta_key, $meta_value );
</del><ins>+ global $wpdb;
+ if ( !is_numeric( $user_id ) )
+ return false;
+ $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
+
+ if ( is_array($meta_value) || is_object($meta_value) )
+ $meta_value = serialize($meta_value);
+ $meta_value = trim( $meta_value );
+
+ $cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+
+ if ( $cur && $cur->umeta_id )
+ do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+
+ if ( ! empty($meta_value) )
+ $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+ else
+ $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+
+ wp_cache_delete($user_id, 'users');
+
+ if ( $cur && $cur->umeta_id )
+ do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2301,9 +2325,39 @@
</span><span class="cx"> * @param string $meta_key Optional. Metadata key.
</span><span class="cx"> * @return mixed
</span><span class="cx"> */
</span><del>-function get_usermeta( $user_id, $meta_key = '') {
</del><ins>+function get_usermeta( $user_id, $meta_key = '' ) {
</ins><span class="cx"> _deprecated_function( __FUNCTION__, '3.0', 'get_user_meta()' );
</span><del>- return get_user_meta( $user_id, $meta_key, false );
</del><ins>+ global $wpdb;
+ $user_id = (int) $user_id;
+
+ if ( !$user_id )
+ return false;
+
+ if ( !empty($meta_key) ) {
+ $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
+ $user = wp_cache_get($user_id, 'users');
+ // Check the cached user object
+ if ( false !== $user && isset($user->$meta_key) )
+ $metas = array($user->$meta_key);
+ else
+ $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+ } else {
+ $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
+ }
+
+ if ( empty($metas) ) {
+ if ( empty($meta_key) )
+ return array();
+ else
+ return '';
+ }
+
+ $metas = array_map('maybe_unserialize', $metas);
+
+ if ( count($metas) == 1 )
+ return $metas[0];
+ else
+ return $metas;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2327,5 +2381,38 @@
</span><span class="cx"> */
</span><span class="cx"> function update_usermeta( $user_id, $meta_key, $meta_value ) {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '3.0', 'update_user_meta()' );
</span><del>- return update_user_meta( $user_id, $meta_key, $meta_value );
</del><ins>+ global $wpdb;
+ if ( !is_numeric( $user_id ) )
+ return false;
+ $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
+
+ /** @todo Might need fix because usermeta data is assumed to be already escaped */
+ if ( is_string($meta_value) )
+ $meta_value = stripslashes($meta_value);
+ $meta_value = maybe_serialize($meta_value);
+
+ if (empty($meta_value)) {
+ return delete_usermeta($user_id, $meta_key);
+ }
+
+ $cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+
+ if ( $cur )
+ do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+
+ if ( !$cur )
+ $wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
+ else if ( $cur->meta_value != $meta_value )
+ $wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+ else
+ return false;
+
+ wp_cache_delete($user_id, 'users');
+
+ if ( !$cur )
+ do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+ else
+ do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (13325 => 13326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2010-02-23 09:08:50 UTC (rev 13325)
+++ trunk/wp-includes/meta.php 2010-02-23 09:15:47 UTC (rev 13326)
</span><span class="lines">@@ -206,11 +206,10 @@
</span><span class="cx"> return $meta_cache;
</span><span class="cx">
</span><span class="cx"> if ( isset($meta_cache[$meta_key]) ) {
</span><del>- if ( $single ) {
</del><ins>+ if ( $single )
</ins><span class="cx"> return maybe_unserialize( $meta_cache[$meta_key][0] );
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> return array_map('maybe_unserialize', $meta_cache[$meta_key]);
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($single)
</span></span></pre>
</div>
</div>
</body>
</html>