<!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>[20279] trunk: Autocomplete site names in Network Admin.</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/20279">20279</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2012-03-24 04:54:58 +0000 (Sat, 24 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Autocomplete site names in Network Admin. More user completion areas. props Japh, DrewAPicture. see <a href="http://core.trac.wordpress.org/ticket/19810">#19810</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</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="#trunkwpadminindexphp">trunk/wp-admin/index.php</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>
<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="#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="#trunkwpadminjssitesearchdevjs">trunk/wp-admin/js/site-search.dev.js</a></li>
<li><a href="#trunkwpadminjssitesearchjs">trunk/wp-admin/js/site-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 (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-admin/admin-ajax.php 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -36,7 +36,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', 'dashboard-widgets',
</del><ins>+ 'autocomplete-user', 'autocomplete-site', 'dashboard-widgets',
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $core_actions_post = array(
</span></span></pre></div>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-admin/css/wp-admin.dev.css 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -900,6 +900,7 @@
</span><span class="cx">
</span><span class="cx"> .ui-autocomplete li a.ui-state-hover {
</span><span class="cx"> background-color: #f0f0b8;
</span><ins>+ cursor: pointer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*------------------------------------------------------------------------------
</span></span></pre></div>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-admin/includes/ajax-actions.php 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -160,18 +160,26 @@
</span><span class="cx">
</span><span class="cx"> $return = array();
</span><span class="cx">
</span><ins>+ // Check the type of request
+ if ( isset( $_REQUEST['autocomplete_type'] ) )
+ $type = $_REQUEST['autocomplete_type'];
+ else
+ $type = 'add';
+
</ins><span class="cx"> // Exclude current users of this blog
</span><span class="cx"> if ( isset( $_REQUEST['site_id'] ) )
</span><span class="cx"> $id = absint( $_REQUEST['site_id'] );
</span><span class="cx"> else
</span><span class="cx"> $id = get_current_blog_id();
</span><span class="cx">
</span><del>- $this_blog_users = get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) );
</del><ins>+ $include_blog_users = ( $type == 'search' ? get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) ) : array() );
+ $exclude_blog_users = ( $type == 'add' ? get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) ) : array() );
</ins><span class="cx">
</span><span class="cx"> $users = get_users( array(
</span><span class="cx"> 'blog_id' => false,
</span><span class="cx"> 'search' => '*' . $_REQUEST['term'] . '*',
</span><del>- 'exclude' => $this_blog_users,
</del><ins>+ 'include' => $include_blog_users,
+ 'exclude' => $exclude_blog_users,
</ins><span class="cx"> 'search_columns' => array( 'user_login', 'user_nicename', 'user_email' ),
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="lines">@@ -206,6 +214,35 @@
</span><span class="cx"> wp_die();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function wp_ajax_autocomplete_site() {
+ if ( ! is_multisite()
+ || ! current_user_can( 'manage_sites' )
+ || wp_is_large_network( 'sites' )
+ || ! is_super_admin()
+ ) {
+ 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 ) );
+}
+
</ins><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 (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-admin/includes/dashboard.php 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -416,6 +416,23 @@
</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><ins>+ if ( is_multisite()
+ && current_user_can( 'promote_users' )
+ && ! wp_is_large_network( 'users' )
+ && is_super_admin()
+ && is_network_admin()
+ ) {
+ wp_enqueue_script( 'user-search' );
+ }
+ if ( is_multisite()
+ && current_user_can( 'manage_sites' )
+ && ! wp_is_large_network( 'sites' )
+ && is_super_admin()
+ && is_network_admin()
+ ) {
+ wp_enqueue_script( 'site-search' );
+ }
+
</ins><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">@@ -440,14 +457,14 @@
</span><span class="cx">
</span><span class="cx"> <form name="searchform" action="<?php echo network_admin_url('users.php'); ?>" method="get">
</span><span class="cx"> <p>
</span><del>- <input type="search" name="s" value="" size="17" />
</del><ins>+ <input type="search" name="s" value="" size="17" id="all-user-search-input" />
</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><span class="cx"> <form name="searchform" action="<?php echo network_admin_url('sites.php'); ?>" method="get">
</span><span class="cx"> <p>
</span><del>- <input type="search" name="s" value="" size="17" />
</del><ins>+ <input type="search" name="s" value="" size="17" id="site-search-input" />
</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="trunkwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/index.php (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/index.php 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-admin/index.php 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> '<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' .
</span><span class="cx"> '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> include (ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx">
</span><span class="cx"> $today = current_time('mysql', 1);
</span></span></pre></div>
<a id="trunkwpadminjssitesearchdevjs"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/js/site-search.dev.js (0 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/site-search.dev.js (rev 0)
+++ trunk/wp-admin/js/site-search.dev.js 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+jQuery( function($) {
+ $( '#site-search-input' ).autocomplete({
+ source: ajaxurl + '?action=autocomplete-site',
+ delay: 500,
+ minLength: 2
+ });
+});
</ins></span></pre></div>
<a id="trunkwpadminjssitesearchjs"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/js/site-search.js (0 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/site-search.js (rev 0)
+++ trunk/wp-admin/js/site-search.js 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+jQuery(function($){$("#site-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-site",delay:500,minLength:2})});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminjsusersearchdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/user-search.dev.js (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/user-search.dev.js 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-admin/js/user-search.dev.js 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -2,8 +2,20 @@
</span><span class="cx"> var id = typeof( current_site_id ) != 'undefined' ? '&site_id=' + current_site_id : '';
</span><span class="cx">
</span><span class="cx"> $( '#adduser-email, #newuser' ).autocomplete({
</span><del>- source: ajaxurl + '?action=autocomplete-user' + id,
</del><ins>+ source: ajaxurl + '?action=autocomplete-user&autocomplete_type=add' + id,
</ins><span class="cx"> delay: 500,
</span><span class="cx"> minLength: 2
</span><span class="cx"> });
</span><del>-});
</del><span class="cx">\ No newline at end of file
</span><ins>+
+ $( '#user-search-input' ).autocomplete({
+ source: ajaxurl + '?action=autocomplete-user&autocomplete_type=search' + id,
+ delay: 500,
+ minLength: 2
+ });
+
+ $( '#all-user-search-input' ).autocomplete({
+ source: ajaxurl + '?action=autocomplete-user&autocomplete_type=search-all' + id,
+ delay: 500,
+ minLength: 2
+ });
+});
</ins></span></pre></div>
<a id="trunkwpadminjsusersearchjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/user-search.js (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/user-search.js 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-admin/js/user-search.js 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -1 +1 @@
</span><del>-jQuery(function(a){var b=typeof(current_site_id)!="undefined"?"&site_id="+current_site_id:"";a("#adduser-email, #newuser").autocomplete({source:ajaxurl+"?action=autocomplete-user"+b,delay:500,minLength:2})});
</del><span class="cx">\ No newline at end of file
</span><ins>+jQuery(function($){var id=typeof(current_site_id)!="undefined"?"&site_id="+current_site_id:"";$("#adduser-email, #newuser").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=add"+id,delay:500,minLength:2});$("#user-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=search"+id,delay:500,minLength:2});$("#all-user-search-input").autocomplete({source:ajaxurl+"?action=autocomplete-user&autocomplete_type=search-all"+id,delay:500,minLength:2})});
</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 (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-admin/network/site-users.php 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> $parent_file = 'sites.php';
</span><span class="cx"> $submenu_file = 'sites.php';
</span><span class="cx">
</span><del>-if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) && !wp_is_large_network( 'users' ) )
</del><ins>+if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) )
</ins><span class="cx"> wp_enqueue_script( 'user-search' );
</span><span class="cx">
</span><span class="cx"> require('../admin-header.php'); ?>
</span></span></pre></div>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-admin/network/sites.php 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -282,6 +282,9 @@
</span><span class="cx">
</span><span class="cx"> $wp_list_table->prepare_items();
</span><span class="cx">
</span><ins>+if ( ! wp_is_large_network( 'sites' ) )
+ wp_enqueue_script( 'site-search' );
+
</ins><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 (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-admin/network/users.php 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -245,6 +245,14 @@
</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><ins>+if ( is_multisite()
+ && current_user_can( 'promote_users' )
+ && ! wp_is_large_network( 'users' )
+ && is_super_admin()
+) {
+ wp_enqueue_script( 'user-search' );
+}
+
</ins><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 class="lines">@@ -288,7 +296,7 @@
</span><span class="cx"> <?php $wp_list_table->views(); ?>
</span><span class="cx">
</span><span class="cx"> <form action="" method="get" class="search-form">
</span><del>- <?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
</del><ins>+ <?php $wp_list_table->search_box( __( 'Search Users' ), 'all-user' ); ?>
</ins><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <form id="form-user-list" action='users.php?action=allusers' method='post'>
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-admin/users.php 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -338,6 +338,15 @@
</span><span class="cx"> wp_redirect( add_query_arg( 'paged', $total_pages ) );
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><ins>+
+ 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' );
+ }
+
</ins><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 (20278 => 20279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2012-03-24 04:35:13 UTC (rev 20278)
+++ trunk/wp-includes/script-loader.php 2012-03-24 04:54:58 UTC (rev 20279)
</span><span class="lines">@@ -268,6 +268,8 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'user-search', "/wp-admin/js/user-search$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
</span><span class="cx">
</span><ins>+ $scripts->add( 'site-search', "/wp-admin/js/site-search$suffix.js", array( 'jquery-ui-autocomplete' ), false, 1 );
+
</ins><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>