<!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>[16166] trunk/wp-admin: Drop Sites search action dropdown.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16166">16166</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-11-03 18:28:02 +0000 (Wed, 03 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop Sites search action dropdown. Determine the search action from the search string. see <a href="http://trac.wordpress.org/ticket/15170">#15170</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmssiteslisttablephp">trunk/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (16165 => 16166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2010-11-03 16:22:24 UTC (rev 16165)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2010-11-03 18:28:02 UTC (rev 16166)
</span><span class="lines">@@ -45,26 +45,32 @@
</span><span class="cx">
</span><span class="cx"> $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
</span><span class="cx">
</span><del>- if ( isset( $_REQUEST['searchaction'] ) ) {
- if ( 'name' == $_REQUEST['searchaction'] ) {
- if ( is_subdomain_install() ) {
- $like_s = str_replace( '.' . $current_site->domain, '', $like_s );
- $like_s .= '.' . $current_site->domain;
- $query .= " AND {$wpdb->blogs}.domain LIKE '$like_s' ";
- } else {
- if ( $like_s != trim('/', $current_site->path) )
- $like_s = $current_site->path .= $like_s . '/';
- $query .= " AND {$wpdb->blogs}.path LIKE '$like_s' ";
- }
- } elseif ( 'id' == $_REQUEST['searchaction'] ) {
- $query .= " AND {$wpdb->blogs}.blog_id = '{$like_s}' ";
- } elseif ( 'ip' == $_REQUEST['searchaction'] ) {
- $query = "SELECT *
- FROM {$wpdb->blogs}, {$wpdb->registration_log}
- WHERE site_id = '{$wpdb->siteid}'
- AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
- AND {$wpdb->registration_log}.IP LIKE ( '%{$like_s}%' )";
</del><ins>+ if ( empty($s) ) {
+ // Nothing to do.
+ } elseif ( false !== strpos($s, '.') ) {
+ // IP address
+ $query = "SELECT *
+ FROM {$wpdb->blogs}, {$wpdb->registration_log}
+ WHERE site_id = '{$wpdb->siteid}'
+ AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
+ AND {$wpdb->registration_log}.IP LIKE ( '{$like_s}%' )";
+ } else {
+ if ( is_subdomain_install() ) {
+ $blog_s = str_replace( '.' . $current_site->domain, '', $like_s );
+ $blog_s .= '.' . $current_site->domain;
+ $query .= " AND ( {$wpdb->blogs}.domain LIKE '$blog_s' ";
+ } else {
+ if ( $like_s != trim('/', $current_site->path) )
+ $blog_s = $current_site->path .= $like_s . '/';
+ else
+ $blog_s = $like_s;
+ $query .= " AND ( {$wpdb->blogs}.path LIKE '$blog_s' ";
</ins><span class="cx"> }
</span><ins>+
+ if ( is_numeric($s) )
+ $query .= " OR {$wpdb->blogs}.blog_id = '{$like_s}' ";
+
+ $query .= ' )';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : 'id';
</span></span></pre></div>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (16165 => 16166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2010-11-03 16:22:24 UTC (rev 16165)
+++ trunk/wp-admin/network/sites.php 2010-11-03 18:28:02 UTC (rev 16166)
</span><span class="lines">@@ -99,12 +99,7 @@
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <input type="hidden" name="action" value="blogs" />
</span><span class="cx"> <input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" />
</span><del>-<?php submit_button( __( 'Search Site by' ), 'button', 'submit', false ); ?>
-<select name="searchaction">
- <option value="name" selected="selected"><?php _e( 'Name' ); ?></option>
- <option value="id"><?php _e( 'ID' ); ?></option>
- <option value="ip"><?php _e( 'IP address' ); ?></option>
-</select>
</del><ins>+<?php submit_button( __( 'Search Sites' ), 'button', 'submit', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>