Changeset 20027 for trunk/wp-admin/includes/class-wp-themes-list-table.php

Timestamp:

02/28/2012 08:51:19 PM (14 years ago)

Author:

nacin

Message:

Faster theme searching. Only calculate what is necessary -- if the theme doesn't have all of the features, bail. If a word matches a tag or header, jump to the next word, we don't care how many times it matches. see #20103.

File:

• trunk/wp-admin/includes/class-wp-themes-list-table.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-themes-list-table.php

@@ -191 +191 @@
 
         function search_theme( $theme ) {
-                $matched = 0;
+                // Search the features
+                if ( $this->features ) {
+                        foreach ( $this->features as $word ) {
+                                if ( ! in_array( $word, $theme['Tags'] ) )
+                                        return false;
+                        }
+                }
 
                 // Match all phrases
-                if ( count( $this->search ) > 0 ) {
+                if ( $this->search ) {
                         foreach ( $this->search as $word ) {
-                                $matched = 0;
-
-                                // In a tag?
                                 if ( in_array( $word, $theme['Tags'] ) )
-                                        $matched = 1;
-
-                                // In one of the fields?
-                                foreach ( array( 'Name', 'Title', 'Description', 'Author', 'Template', 'Stylesheet' ) AS $field ) {
-                                        if ( stripos( $theme[$field], $word ) !== false )
-                                                $matched++;
-                                }
-
-                                if ( $matched == 0 )
-                                        return false;
-                        }
-                }
-
-                // Now search the features
-                if ( count( $this->features ) > 0 ) {
-                        foreach ( $this->features as $word ) {
-                                // In a tag?
-                                if ( !in_array( $word, $theme['Tags'] ) )
-                                        return false;
-                        }
-                }
-
-                // Only get here if each word exists in the tags or one of the fields
+                                        continue;
+                        }
+
+                        foreach ( array( 'Name', 'Title', 'Description', 'Author', 'Template', 'Stylesheet' ) as $header ) {
+                                if ( false !== stripos( $theme[ $header ], $word ) )
+                                        continue 2;
+                        }
+
+                        return false;
+                }
+
                 return true;
         }