Changeset 16161

Timestamp:

11/03/2010 01:57:43 PM (14 years ago)

Author:

ryan

Message:

Lose wildcards in site search. Maybe bring it back as an option. see #15170

File:

• trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (modified) (2 diffs)

trunk/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -22 +22 @@
 
     function prepare_items() {
-        global $s, $mode, $wpdb;
+        global $s, $mode, $wpdb, $current_site;
 
         $mode = ( empty( $_REQUEST['mode'] ) ) ? 'list' : $_REQUEST['mode'];
@@ -48 +48 @@
         if ( isset( $_REQUEST['searchaction'] ) ) {
             if ( 'name' == $_REQUEST['searchaction'] ) {
-                $query .= " AND ( {$wpdb->blogs}.domain LIKE '%{$like_s}%' OR {$wpdb->blogs}.path LIKE '%{$like_s}%' ) ";
+                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}' ";