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

Timestamp:

11/03/2010 07:26:23 PM (16 years ago)

Author:

ryan

Message:

Allow trailing wildcard site searches by appending *. 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

@@ -31 +31 @@
 
                 $s = isset( $_REQUEST['s'] ) ? stripslashes( trim( $_REQUEST[ 's' ] ) ) : '';
+                $wild = '';
+                if ( false !== strpos($s, '*') ) {
+                        $wild = '%';
+                        $s = trim($s, '*');
+                }
+
                 $like_s = esc_sql( like_escape( $s ) );
 
@@ -54 +60 @@
                                 WHERE site_id = '{$wpdb->siteid}'
                                 AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
-                                AND {$wpdb->registration_log}.IP LIKE ( '{$like_s}%' )";
+                                AND {$wpdb->registration_log}.IP LIKE ( '{$like_s}$wild' )";
                 } else {
                         if ( is_subdomain_install() ) {
                                 $blog_s = str_replace( '.' . $current_site->domain, '', $like_s );
-                                $blog_s .= '.' . $current_site->domain;
+                                $blog_s .= $wild . '.' . $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 . '/';
+                                        $blog_s = $current_site->path .= $like_s . $wild . '/';
                                 else
                                         $blog_s = $like_s;