<!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>[21003] trunk: Remove user/site suggestions (autocompletion) from search inputs, as the UX isn't proper.</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, #logmsg > ol { margin-left: 0; 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/21003">21003</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-06-05 18:51:33 +0000 (Tue, 05 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove user/site suggestions (autocompletion) from search inputs, as the UX isn't proper.
* Removes all instances of site-search, so away it goes. Sidesteps a number of bugs with site-search.
* Renames user-search to user-suggest, which means it better describes the current behavior (autocompletion) while allowing for future behavior (instant search).
* Ties user suggestions to a single .wp-suggest-user class.
with help from markjaquith, helenyhou, wonderboymusic.
fixes <a href="http://core.trac.wordpress.org/ticket/20835">#20835</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
<li><a href="#trunkwpadminnetworkusersphp">trunk/wp-admin/network/users.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminjsusersuggestdevjs">trunk/wp-admin/js/user-suggest.dev.js</a></li>
<li><a href="#trunkwpadminjsusersuggestjs">trunk/wp-admin/js/user-suggest.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpadminjssitesearchdevjs">trunk/wp-admin/js/site-search.dev.js</a></li>
<li><a href="#trunkwpadminjssitesearchjs">trunk/wp-admin/js/site-search.js</a></li>
<li><a href="#trunkwpadminjsusersearchdevjs">trunk/wp-admin/js/user-search.dev.js</a></li>
<li><a href="#trunkwpadminjsusersearchjs">trunk/wp-admin/js/user-search.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/admin-ajax.php 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> $core_actions_get = array(
</span><span class="cx"> 'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
</span><del>- 'autocomplete-user', 'autocomplete-site', 'dashboard-widgets',
</del><ins>+ 'autocomplete-user', 'dashboard-widgets',
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $core_actions_post = array(
</span></span></pre></div>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/includes/ajax-actions.php 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -212,30 +212,6 @@
</span><span class="cx"> wp_die();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function wp_ajax_autocomplete_site() {
- if ( ! is_multisite() || ! current_user_can( 'manage_sites' ) || wp_is_large_network( 'sites' ) )
- wp_die( -1 );
-
- $return = array();
-
- global $wpdb;
- $like_escaped_term = '%' . like_escape( stripslashes( $_REQUEST['term'] ) ) . '%';
- $sites = $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE ( domain LIKE %s OR path LIKE %s ) AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $like_escaped_term, $like_escaped_term ), ARRAY_A );
-
- if ( empty( $sites ) )
- wp_die( -1 );
-
- foreach ( (array) $sites as $details ) {
- $blogname = get_blog_option( $details['blog_id'], 'blogname' );
- $return[] = array(
- 'label' => sprintf( '%1$s (%2$s)', $blogname, $details['domain'] . $details['path'] ),
- 'value' => $details['domain']
- );
- }
-
- wp_die( json_encode( $return ) );
-}
-
</del><span class="cx"> /*
</span><span class="cx"> * Ajax helper.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/includes/dashboard.php 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -414,12 +414,6 @@
</span><span class="cx"> if ( current_user_can('create_users') )
</span><span class="cx"> $actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
</span><span class="cx">
</span><del>- if ( ! wp_is_large_network( 'users' ) )
- wp_enqueue_script( 'user-search' );
-
- if ( ! wp_is_large_network( 'sites' ) )
- wp_enqueue_script( 'site-search' );
-
</del><span class="cx"> $c_users = get_user_count();
</span><span class="cx"> $c_blogs = get_blog_count();
</span><span class="cx">
</span><span class="lines">@@ -442,16 +436,16 @@
</span><span class="cx"> <p class="youhave"><?php echo $sentence; ?></p>
</span><span class="cx"> <?php do_action( 'wpmuadminresult', '' ); ?>
</span><span class="cx">
</span><del>- <form name="searchform" action="<?php echo network_admin_url('users.php'); ?>" method="get">
</del><ins>+ <form action="<?php echo network_admin_url('users.php'); ?>" method="get">
</ins><span class="cx"> <p>
</span><del>- <input type="search" name="s" value="" size="30" id="all-user-search-input" />
</del><ins>+ <input type="search" name="s" value="" size="30" autocomplete="off" />
</ins><span class="cx"> <?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span><del>- <form name="searchform" action="<?php echo network_admin_url('sites.php'); ?>" method="get">
</del><ins>+ <form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
</ins><span class="cx"> <p>
</span><del>- <input type="search" name="s" value="" size="30" id="site-search-input" />
</del><ins>+ <input type="search" name="s" value="" size="30" autocomplete="off" />
</ins><span class="cx"> <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span></span></pre></div>
<a id="trunkwpadminjssitesearchdevjs"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/js/site-search.dev.js (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/site-search.dev.js 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/js/site-search.dev.js 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-jQuery( function($) {
- var isRTL = !! ( 'undefined' != typeof isRtl && isRtl );
- $( '#site-search-input' ).autocomplete({
- source: ajaxurl + '?action=autocomplete-site',
- delay: 500,
- minLength: 2,
- position: isRTL ? { my: 'right top', at: 'right bottom', offset: '0, -1' } : { offset: '0, -1' },
- open: function(e, ui) { $(this).addClass('open'); },
- close: function(e, ui) { $(this).removeClass('open'); }
- });
-});
</del></span></pre></div>
<a id="trunkwpadminjssitesearchjs"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/js/site-search.js (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/site-search.js 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/js/site-search.js 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-jQuery(function(b){var a=!!("undefined"!=typeof isRtl&&isRtl);b("#site-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-site",delay:500,minLength:2,position:a?{my:"right top",at:"right bottom",offset:"0, -1"}:{offset:"0, -1"},open:function(d,c){b(this).addClass("open")},close:function(d,c){b(this).removeClass("open")}})});
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminjsusersearchdevjs"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/js/user-search.dev.js (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/user-search.dev.js 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/js/user-search.dev.js 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-jQuery( function($) {
- var id = typeof( current_site_id ) != 'undefined' ? '&site_id=' + current_site_id : '',
- isRTL = !! ( 'undefined' != typeof isRtl && isRtl ),
- position = isRTL ? { my: 'right top', at: 'right bottom', offset: '0, -1' } : { offset: '0, -1' },
- open = function(e, ui) {
- $(this).addClass('open');
- },
- close = function(e, ui) {
- $(this).removeClass('open');
- };
-
- $( '#adduser-email, #newuser' ).autocomplete({
- source: ajaxurl + '?action=autocomplete-user&autocomplete_type=add' + id,
- delay: 500,
- minLength: 2,
- position: position,
- open: open,
- close: close
- });
-
- $( '#user-search-input' ).autocomplete({
- source: ajaxurl + '?action=autocomplete-user&autocomplete_type=search' + id,
- delay: 500,
- minLength: 2,
- position: position,
- open: open,
- close: close
- });
-
- $( '#all-user-search-input' ).autocomplete({
- source: ajaxurl + '?action=autocomplete-user&autocomplete_type=search-all' + id,
- delay: 500,
- minLength: 2,
- position: position,
- open: open,
- close: close
- });
-});
</del></span></pre></div>
<a id="trunkwpadminjsusersearchjs"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/js/user-search.js (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/user-search.js 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/js/user-search.js 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-jQuery(function(d){var f=typeof(current_site_id)!="undefined"?"&site_id="+current_site_id:"",c=!!("undefined"!=typeof isRtl&&isRtl),a=c?{my:"right top",at:"right bottom",offset:"0, -1"}:{offset:"0, -1"},b=function(h,g){d(this).addClass("open")},e=function(h,g){d(this).removeClass("open")};d("#adduser-email, #newuser").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=add"+f,delay:500,minLength:2,position:a,open:b,close:e});d("#user-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=search"+f,delay:500,minLength:2,position:a,open:b,close:e});d("#all-user-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=search-all"+f,delay:500,minLength:2,position:a,open:b,close:e})});
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminjsusersuggestdevjsfromrev20992trunkwpadminjsusersearchdevjs"></a>
<div class="copfile"><h4>Copied: trunk/wp-admin/js/user-suggest.dev.js (from rev 20992, trunk/wp-admin/js/user-search.dev.js) (0 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/user-suggest.dev.js (rev 0)
+++ trunk/wp-admin/js/user-suggest.dev.js 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+(function($) {
+ var id = 'undefined' !== typeof current_site_id ? '&site_id=' + current_site_id : '';
+ $(document).ready( function() {
+ $( '.wp-suggest-user' ).autocomplete({
+ source: ajaxurl + '?action=autocomplete-user&autocomplete_type=add' + id,
+ delay: 500,
+ minLength: 2,
+ position: ( 'undefined' !== typeof isRtl && isRtl ) ? { my: 'right top', at: 'right bottom', offset: '0, -1' } : { offset: '0, -1' },
+ open: function() { $(this).addClass('open'); },
+ close: function() { $(this).removeClass('open'); }
+ });
+ });
+})(jQuery);
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminjsusersuggestjsfromrev20992trunkwpadminjsusersearchjs"></a>
<div class="copfile"><h4>Copied: trunk/wp-admin/js/user-suggest.js (from rev 20992, trunk/wp-admin/js/user-search.js) (0 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/user-suggest.js (rev 0)
+++ trunk/wp-admin/js/user-suggest.js 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+jQuery(function(d){var f=typeof(current_site_id)!="undefined"?"&site_id="+current_site_id:"",c=!!("undefined"!=typeof isRtl&&isRtl),a=c?{my:"right top",at:"right bottom",offset:"0, -1"}:{offset:"0, -1"},b=function(h,g){d(this).addClass("open")},e=function(h,g){d(this).removeClass("open")};d("#adduser-email, #newuser").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=add"+f,delay:500,minLength:2,position:a,open:b,close:e});d("#user-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=search"+f,delay:500,minLength:2,position:a,open:b,close:e});d("#all-user-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=search-all"+f,delay:500,minLength:2,position:a,open:b,close:e})});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/network/site-users.php 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> $submenu_file = 'sites.php';
</span><span class="cx">
</span><span class="cx"> if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) )
</span><del>- wp_enqueue_script( 'user-search' );
</del><ins>+ wp_enqueue_script( 'user-suggest' );
</ins><span class="cx">
</span><span class="cx"> require('../admin-header.php'); ?>
</span><span class="cx">
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php _e( 'Username' ); ?></th>
</span><del>- <td><input type="text" class="regular-text" name="newuser" id="newuser" /></td>
</del><ins>+ <td><input type="text" class="regular-text wp-suggest-user" name="newuser" id="newuser" /></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <th scope="row"><?php _e( 'Role'); ?></th>
</span></span></pre></div>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/network/sites.php 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -282,9 +282,6 @@
</span><span class="cx">
</span><span class="cx"> $wp_list_table->prepare_items();
</span><span class="cx">
</span><del>-if ( ! wp_is_large_network( 'sites' ) )
- wp_enqueue_script( 'site-search' );
-
</del><span class="cx"> require_once( '../admin-header.php' );
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/users.php (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/network/users.php 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -245,9 +245,6 @@
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx">
</span><del>-if ( ! wp_is_large_network( 'users' ) )
- wp_enqueue_script( 'user-search' );
-
</del><span class="cx"> require_once( '../admin-header.php' );
</span><span class="cx">
</span><span class="cx"> if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/user-new.php 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
</span><span class="cx"> && ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
</span><span class="cx"> ) {
</span><del>- wp_enqueue_script( 'user-search' );
</del><ins>+ wp_enqueue_script( 'user-suggest' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> require_once( 'admin-header.php' );
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="cx"> <th scope="row"><label for="adduser-email"><?php echo $label; ?></label></th>
</span><del>- <td><input name="email" type="text" id="adduser-email" value="" /></td>
</del><ins>+ <td><input name="email" type="text" id="adduser-email" class="wp-suggest-user" value="" /></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row"><label for="adduser-role"><?php _e('Role'); ?></label></th>
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-admin/users.php 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -339,12 +339,6 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
- && ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
- ) {
- wp_enqueue_script( 'user-search' );
- }
-
</del><span class="cx"> include('./admin-header.php');
</span><span class="cx">
</span><span class="cx"> $messages = array();
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (21002 => 21003)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2012-06-05 18:44:31 UTC (rev 21002)
+++ trunk/wp-includes/script-loader.php 2012-06-05 18:51:33 UTC (rev 21003)
</span><span class="lines">@@ -267,10 +267,8 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), false, 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'user-search', "/wp-admin/js/user-search$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
</del><ins>+ $scripts->add( 'user-suggest', "/wp-admin/js/user-suggest$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
</ins><span class="cx">
</span><del>- $scripts->add( 'site-search', "/wp-admin/js/site-search$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
-
</del><span class="cx"> $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wpdialogs' ), false, 1 );
</span></span></pre>
</div>
</div>
</body>
</html>