<!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>[27046] trunk/src/wp-admin: Autocomplete for the new site admin email.</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/27046">27046</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-01-27 23:09:08 +0000 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Autocomplete for the new site admin email. Better than trying to remember which email address you used.
fixes <a href="http://core.trac.wordpress.org/ticket/25348">#25348</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminjsusersuggestjs">trunk/src/wp-admin/js/user-suggest.js</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/ajax-actions.php (27045 => 27046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php 2014-01-27 16:31:54 UTC (rev 27045)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2014-01-27 23:09:08 UTC (rev 27046)
</span><span class="lines">@@ -197,16 +197,27 @@
</span><span class="cx"> $return = array();
</span><span class="cx">
</span><span class="cx"> // Check the type of request
</span><del>- if ( isset( $_REQUEST['autocomplete_type'] ) )
</del><ins>+ // Current allowed values are `add` and `search`
+ if ( isset( $_REQUEST['autocomplete_type'] ) && 'search' === $_REQUEST['autocomplete_type'] ) {
</ins><span class="cx"> $type = $_REQUEST['autocomplete_type'];
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $type = 'add';
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ // Check the desired field for value
+ // Current allowed values are `user_email` and `user_login`
+ if ( isset( $_REQUEST['autocomplete_field'] ) && 'user_email' === $_REQUEST['autocomplete_field'] ) {
+ $field = $_REQUEST['autocomplete_field'];
+ } else {
+ $field = 'user_login';
+ }
+
</ins><span class="cx"> // Exclude current users of this blog
</span><del>- if ( isset( $_REQUEST['site_id'] ) )
</del><ins>+ if ( isset( $_REQUEST['site_id'] ) ) {
</ins><span class="cx"> $id = absint( $_REQUEST['site_id'] );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $id = get_current_blog_id();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $include_blog_users = ( $type == 'search' ? get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) ) : array() );
</span><span class="cx"> $exclude_blog_users = ( $type == 'add' ? get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) ) : array() );
</span><span class="lines">@@ -223,7 +234,7 @@
</span><span class="cx"> $return[] = array(
</span><span class="cx"> /* translators: 1: user_login, 2: user_email */
</span><span class="cx"> 'label' => sprintf( __( '%1$s (%2$s)' ), $user->user_login, $user->user_email ),
</span><del>- 'value' => $user->user_login,
</del><ins>+ 'value' => $user->$field,
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminjsusersuggestjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/user-suggest.js (27045 => 27046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/user-suggest.js 2014-01-27 16:31:54 UTC (rev 27045)
+++ trunk/src/wp-admin/js/user-suggest.js 2014-01-27 23:09:08 UTC (rev 27046)
</span><span class="lines">@@ -8,17 +8,23 @@
</span><span class="cx"> position.my = 'right top';
</span><span class="cx"> position.at = 'right bottom';
</span><span class="cx"> }
</span><del>- $( '.wp-suggest-user' ).autocomplete({
- source: ajaxurl + '?action=autocomplete-user&autocomplete_type=add' + id,
- delay: 500,
- minLength: 2,
- position: position,
- open: function() {
- $( this ).addClass( 'open' );
- },
- close: function() {
- $( this ).removeClass( 'open' );
- }
</del><ins>+ $( '.wp-suggest-user' ).each( function(){
+ var $this = $( this ),
+ autocompleteType = ( typeof $this.data( 'autocompleteType' ) !== 'undefined' ) ? $this.data( 'autocompleteType' ) : 'add',
+ autocompleteField = ( typeof $this.data( 'autocompleteField' ) !== 'undefined' ) ? $this.data( 'autocompleteField' ) : 'user_login';
+
+ $this.autocomplete({
+ source: ajaxurl + '?action=autocomplete-user&autocomplete_type=' + autocompleteType + '&autocomplete_field=' + autocompleteField + id,
+ delay: 500,
+ minLength: 2,
+ position: position,
+ open: function() {
+ $( this ).addClass( 'open' );
+ },
+ close: function() {
+ $( this ).removeClass( 'open' );
+ }
+ });
</ins><span class="cx"> });
</span><span class="cx"> });
</span><del>-})( jQuery );
</del><span class="cx">\ No newline at end of file
</span><ins>+})( jQuery );
</ins></span></pre></div>
<a id="trunksrcwpadminnetworksitenewphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/site-new.php (27045 => 27046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/site-new.php 2014-01-27 16:31:54 UTC (rev 27045)
+++ trunk/src/wp-admin/network/site-new.php 2014-01-27 23:09:08 UTC (rev 27046)
</span><span class="lines">@@ -106,6 +106,8 @@
</span><span class="cx"> $title = __('Add New Site');
</span><span class="cx"> $parent_file = 'sites.php';
</span><span class="cx">
</span><ins>+wp_enqueue_script( 'user-suggest' );
+
</ins><span class="cx"> require( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="lines">@@ -138,7 +140,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="cx"> <th scope="row"><?php _e( 'Admin Email' ) ?></th>
</span><del>- <td><input name="blog[email]" type="text" class="regular-text" title="<?php esc_attr_e( 'Email' ) ?>"/></td>
</del><ins>+ <td><input name="blog[email]" type="text" class="regular-text wp-suggest-user" data-autocomplete-type="search" data-autocomplete-field="user_email" title="<?php esc_attr_e( 'Email' ) ?>"/></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
</span></span></pre>
</div>
</div>
</body>
</html>