<!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" />
<title>[25606] trunk/src: Introduce wp_get_user_contact_methods() as a public version of _wp_get_user_contactmethods.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25606">25606</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-09-24 18:13:18 +0000 (Tue, 24 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce wp_get_user_contact_methods() as a public version of _wp_get_user_contactmethods.
props johnnyb.
fixes <a href="http://core.trac.wordpress.org/ticket/24273">#24273</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/user.php (25605 => 25606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/user.php 2013-09-24 17:09:56 UTC (rev 25605)
+++ trunk/src/wp-admin/includes/user.php 2013-09-24 18:13:18 UTC (rev 25606)
</span><span class="lines">@@ -85,7 +85,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( $user ) as $method => $name ) {
</del><ins>+ foreach ( wp_get_user_contact_methods( $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></pre></div>
<a id="trunksrcwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/user-edit.php (25605 => 25606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/user-edit.php 2013-09-24 17:09:56 UTC (rev 25605)
+++ trunk/src/wp-admin/user-edit.php 2013-09-24 18:13:18 UTC (rev 25606)
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- foreach (_wp_get_user_contactmethods( $profileuser ) as $name => $desc) {
</del><ins>+ foreach ( wp_get_user_contact_methods( $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="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/user.php (25605 => 25606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/user.php 2013-09-24 17:09:56 UTC (rev 25605)
+++ trunk/src/wp-includes/user.php 2013-09-24 18:13:18 UTC (rev 25606)
</span><span class="lines">@@ -1539,33 +1539,51 @@
</span><span class="cx"> */
</span><span class="cx"> function _get_additional_user_keys( $user ) {
</span><span class="cx"> $keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front' );
</span><del>- return array_merge( $keys, array_keys( _wp_get_user_contactmethods( $user ) ) );
</del><ins>+ return array_merge( $keys, array_keys( wp_get_user_contact_methods( $user ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Set up the contact methods.
</del><ins>+ * Set up the user contact methods.
</ins><span class="cx"> *
</span><span class="cx"> * Default contact methods were removed in 3.6. A filter dictates contact methods.
</span><span class="cx"> *
</span><del>- * @since 2.9.0
- * @access private
</del><ins>+ * @since 3.7.0
</ins><span class="cx"> *
</span><del>- * @param object $user User data object (optional).
- * @return array $user_contactmethods Array of contact methods and their labels.
</del><ins>+ * @param WP_User $user Optional. WP_User object.
+ * @return array Array of contact methods and their labels.
</ins><span class="cx"> */
</span><del>-function _wp_get_user_contactmethods( $user = null ) {
- $user_contactmethods = array();
</del><ins>+function wp_get_user_contact_methods( $user = null ) {
+ $methods = array();
</ins><span class="cx"> if ( get_site_option( 'initial_db_version' ) < 23588 ) {
</span><del>- $user_contactmethods = array(
</del><ins>+ $methods = array(
</ins><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><span class="cx"> }
</span><del>- return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
</del><ins>+
+ /**
+ * Filter the user contact methods.
+ *
+ * @since 2.9.0
+ *
+ * @param array $methods Array of contact methods and their labels.
+ * @param WP_User $user Optional. WP_User object.
+ */
+ return apply_filters( 'user_contactmethods', $methods, $user );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * The old private function for setting up user contact methods.
+ *
+ * @since 2.9.0
+ * @access private
+ */
+function _wp_get_user_contactmethods( $user = null ) {
+ return wp_get_user_contact_methods( $user );
+}
+
+/**
</ins><span class="cx"> * Retrieves a user row based on password reset key and login
</span><span class="cx"> *
</span><span class="cx"> * @uses $wpdb WordPress Database object
</span></span></pre>
</div>
</div>
</body>
</html>