Changeset 20048

Timestamp:

02/29/2012 10:19:18 PM (13 years ago)

Author:

nacin

Message:

In WP_Themes_List_Table, don't perform unnecessary sanitization on search terms or filter features. We only use these for case-insensitive comparison. see #19815.

File:

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

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

@@ -10 +10 @@
 class WP_Themes_List_Table extends WP_List_Table {
 
-    var $search = array();
+    protected $search_terms = array();
     var $features = array();
-    
+
     function __construct() {
         parent::__construct( array(
@@ -27 +27 @@
         $themes = wp_get_themes( array( 'allowed' => true ) );
 
-        if ( ! empty( $_REQUEST['s'] ) ) {
-            $search = strtolower( stripslashes( $_REQUEST['s'] ) );
-            $this->search = array_merge( $this->search, array_filter( array_map( 'trim', explode( ',', $search ) ) ) );
-            $this->search = array_unique( $this->search );
-        }
-
-        if ( !empty( $_REQUEST['features'] ) ) {
+        if ( ! empty( $_REQUEST['s'] ) )
+            $this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( stripslashes( $_REQUEST['s'] ) ) ) ) ) );
+
+        if ( ! empty( $_REQUEST['features'] ) ) {
+            var_dump( $_REQUEST['features'] );
             $this->features = $_REQUEST['features'];
-            $this->features = array_map( 'trim', $this->features );
-            $this->features = array_map( 'sanitize_title_with_dashes', $this->features );
-            $this->features = array_unique( $this->features );
-        }
-
-        if ( $this->search || $this->features ) {
+        }
+
+        if ( $this->search_terms || $this->features ) {
             foreach ( $themes as $key => $theme ) {
                 if ( ! $this->search_theme( $theme ) )
@@ -64 +59 @@
 
     function no_items() {
-        if ( $this->search || $this->features ) {
+        if ( $this->search_terms || $this->features ) {
             _e( 'No items found.' );
             return;
@@ -187 +182 @@
     function search_theme( $theme ) {
         // Search the features
-        if ( $this->features ) {
-            foreach ( $this->features as $word ) {
-                if ( ! in_array( $word, $theme->get('Tags') ) )
-                    return false;
-            }
+        foreach ( $this->features as $word ) {
+            if ( ! in_array( $word, $theme->get('Tags') ) )
+                return false;
         }
 
         // Match all phrases
-        if ( $this->search ) {
-            foreach ( $this->search as $word ) {
-                if ( in_array( $word, $theme->get('Tags') ) )
-                    continue;
-
-                foreach ( array( 'Name', 'Description', 'Author', 'AuthorURI' ) as $header ) {
-                    // Don't mark up; Do translate.
-                    if ( false !== stripos( $theme->display( $header, false, true ), $word ) )
-                        continue 2;
-                }
-
-                if ( false !== stripos( $theme->get_stylesheet(), $word ) )
-                    continue;
-
-                if ( false !== stripos( $theme->get_template(), $word ) )
-                    continue;
- 
-                return false;
-            }
+        foreach ( $this->search_terms as $word ) {
+            if ( in_array( $word, $theme->get('Tags') ) )
+                continue;
+
+            foreach ( array( 'Name', 'Description', 'Author', 'AuthorURI' ) as $header ) {
+                // Don't mark up; Do translate.
+                if ( false !== stripos( $theme->display( $header, false, true ), $word ) )
+                    continue 2;
+            }
+
+            if ( false !== stripos( $theme->get_stylesheet(), $word ) )
+                continue;
+
+            if ( false !== stripos( $theme->get_template(), $word ) )
+                continue;
+
+            return false;
         }