Changeset 15807

Timestamp:

10/14/2010 06:37:08 PM (16 years ago)

Author:

ryan

Message:

Hook up theme filter. see #14936

Location:

trunk/wp-admin

Files:

• includes/default-list-tables.php (modified) (2 diffs)
• themes.php (modified) (2 diffs)

trunk/wp-admin/includes/default-list-tables.php

@@ -3871 +3871 @@
                         wp_die( __( 'Cheatin’ uh?' ) );
         }
-        
+
         function prepare_items() {
                 global $ct;
@@ -3881 +3881 @@
                 $search = !empty( $_REQUEST['s'] ) ? trim( stripslashes( $_REQUEST['s'] ) ) : '';
 
-                if ( '' !== $this->search ) {
+                if ( '' !== $search ) {
                         $this->search = array_merge( $this->search, array_filter( array_map( 'trim', explode( ',', $search ) ) ) );
                         $this->search = array_unique( $this->search );
+                }
+
+                if ( !empty( $_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 ) {
                         foreach ( $themes as $key => $theme ) {
                                 if ( !$this->search_theme( $theme ) )

trunk/wp-admin/themes.php

@@ -143 +143 @@
 <br class="clear"/>
 
-<div id="filters" <?php if ( ! isset( $tpage ) || $tpage != 'filter' ) echo ' style="display: none"' ?>>
+<div id="filters" style="display: none;">
 <?php $feature_list = get_theme_feature_list(); ?>
         <div class="feature-filter">
@@ -161 +161 @@
                                                 ?>
                                 <li>
-                                        <input type="checkbox" name="features[<?php echo $key; ?>]" id="feature-id-<?php echo $key; ?>" value="<?php echo $key; ?>" <?php checked( isset( $checked_features ) && in_array( $key, $checked_features ) ); ?>/>
+                                        <input type="checkbox" name="features[<?php echo $key; ?>]" id="feature-id-<?php echo $key; ?>" value="<?php echo $key; ?>" <?php checked( in_array( $key, $wp_list_table->features ) ); ?>/>
                                         <label for="feature-id-<?php echo $key; ?>"><?php echo $feature_name; ?></label>
                                 </li>