<!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>[15896] trunk: Pass user object through _wp_get_user_contactmethods()
to the user_contactmethods filter.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15896">15896</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-21 15:42:06 +0000 (Thu, 21 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass user object through _wp_get_user_contactmethods() to the user_contactmethods filter. props aaroncampbell, fixes <a href="http://trac.wordpress.org/ticket/15186">#15186</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesuserphp">trunk/wp-admin/includes/user.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpincludesregistrationphp">trunk/wp-includes/registration.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (15895 => 15896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php 2010-10-21 15:38:50 UTC (rev 15895)
+++ trunk/wp-admin/includes/user.php 2010-10-21 15:42:06 UTC (rev 15896)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> if ( isset( $_POST['description'] ) )
</span><span class="cx"> $user->description = trim( $_POST['description'] );
</span><span class="cx">
</span><del>- foreach ( _wp_get_user_contactmethods() as $method => $name ) {
</del><ins>+ foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) {
</ins><span class="cx"> if ( isset( $_POST[$method] ))
</span><span class="cx"> $user->$method = sanitize_text_field( $_POST[$method] );
</span><span class="cx"> }
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> function get_user_to_edit( $user_id ) {
</span><span class="cx"> $user = new WP_User( $user_id );
</span><span class="cx">
</span><del>- $user_contactmethods = _wp_get_user_contactmethods();
</del><ins>+ $user_contactmethods = _wp_get_user_contactmethods( $user );
</ins><span class="cx"> foreach ($user_contactmethods as $method => $name) {
</span><span class="cx"> if ( empty( $user->{$method} ) )
</span><span class="cx"> $user->{$method} = '';
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (15895 => 15896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-10-21 15:38:50 UTC (rev 15895)
+++ trunk/wp-admin/user-edit.php 2010-10-21 15:42:06 UTC (rev 15896)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- foreach (_wp_get_user_contactmethods() as $name => $desc) {
</del><ins>+ foreach (_wp_get_user_contactmethods( $profileuser ) as $name => $desc) {
</ins><span class="cx"> ?>
</span><span class="cx"> <tr>
</span><span class="cx"> <th><label for="<?php echo $name; ?>"><?php echo apply_filters('user_'.$name.'_label', $desc); ?></label></th>
</span></span></pre></div>
<a id="trunkwpincludesregistrationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/registration.php (15895 => 15896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/registration.php 2010-10-21 15:38:50 UTC (rev 15895)
+++ trunk/wp-includes/registration.php 2010-10-21 15:42:06 UTC (rev 15896)
</span><span class="lines">@@ -211,20 +211,19 @@
</span><span class="cx"> update_user_meta( $user_id, 'admin_color', $admin_color);
</span><span class="cx"> update_user_meta( $user_id, 'use_ssl', $use_ssl);
</span><span class="cx">
</span><del>- foreach ( _wp_get_user_contactmethods() as $method => $name ) {
</del><ins>+ $user = new WP_User($user_id);
+
+ foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) {
</ins><span class="cx"> if ( empty($$method) )
</span><span class="cx"> $$method = '';
</span><span class="cx">
</span><span class="cx"> update_user_meta( $user_id, $method, $$method );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( isset($role) ) {
- $user = new WP_User($user_id);
</del><ins>+ if ( isset($role) )
</ins><span class="cx"> $user->set_role($role);
</span><del>- } elseif ( !$update ) {
- $user = new WP_User($user_id);
</del><ins>+ elseif ( !$update )
</ins><span class="cx"> $user->set_role(get_option('default_role'));
</span><del>- }
</del><span class="cx">
</span><span class="cx"> wp_cache_delete($user_id, 'users');
</span><span class="cx"> wp_cache_delete($user_login, 'userlogins');
</span><span class="lines">@@ -319,15 +318,16 @@
</span><span class="cx"> * @access private
</span><span class="cx"> * @since
</span><span class="cx"> *
</span><ins>+ * @param object $user User data object (optional)
</ins><span class="cx"> * @return array $user_contactmethods Array of contact methods and their labels.
</span><span class="cx"> */
</span><del>-function _wp_get_user_contactmethods() {
</del><ins>+function _wp_get_user_contactmethods( $user = null ) {
</ins><span class="cx"> $user_contactmethods = array(
</span><span class="cx"> 'aim' => __('AIM'),
</span><span class="cx"> 'yim' => __('Yahoo IM'),
</span><span class="cx"> 'jabber' => __('Jabber / Google Talk')
</span><span class="cx"> );
</span><del>- return apply_filters('user_contactmethods',$user_contactmethods);
</del><ins>+ return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>