WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert [20096] which was an accidental partial revert of [20094]. see #19815. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-03-02 22:31:15 +00:00
parent 4805a38f7d
commit 21663b39ea
1 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
wp-admin/includes/class-wp-theme-install-list-table.php
View File

@ -7,25 +7,30 @@
* @since 3.1.0
* @access private
*/
class WP_Theme_Install_List_Table extends WP_List_Table {
class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
function __construct() {
parent::__construct( array(
'ajax' => true,
) );
}
var $features = array();
function ajax_user_can() {
return current_user_can('install_themes');
return current_user_can( 'install_themes' );
}
function prepare_items() {
include( ABSPATH . 'wp-admin/includes/theme-install.php' );
global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;
global $tabs, $tab, $paged, $type, $theme_field_defaults;
wp_reset_vars( array( 'tab' ) );
$search_terms = array();
$search_string = '';
if ( ! empty( $_REQUEST['s'] ) ){
$search_string = strtolower( stripslashes( $_REQUEST['s'] ) );
$search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
}
if ( ! empty( $_REQUEST['features'] ) )
$this->features = $_REQUEST['features'];
$paged = $this->get_pagenum();
$per_page = 36;
@ -55,29 +60,21 @@ class WP_Theme_Install_List_Table extends WP_List_Table {
switch ( $tab ) {
case 'search':
$type = isset( $_REQUEST['type'] ) ? stripslashes( $_REQUEST['type'] ) : '';
$term = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
switch ( $type ) {
case 'tag':
$terms = explode( ',', $term );
$terms = array_map( 'trim', $terms );
$terms = array_map( 'sanitize_key', $terms );
$args['tag'] = $terms;
$args['tag'] = array_map( 'sanitize_title_with_dashes', $search_terms );
break;
case 'term':
$args['search'] = $term;
$args['search'] = $search_string;
break;
case 'author':
$args['author'] = $term;
$args['author'] = $search_string;
break;
}
if ( !empty( $_REQUEST['features'] ) ) {
$terms = $_REQUEST['features'];
$terms = array_map( 'trim', $terms );
$terms = array_map( 'sanitize_key', $terms );
$args['tag'] = $terms;
$_REQUEST['s'] = implode( ',', $terms );
if ( ! empty( $this->features ) ) {
$args['tag'] = $this->features;
$_REQUEST['s'] = implode( ',', $this->features );
$_REQUEST['type'] = 'tag';
}
@ -95,7 +92,7 @@ class WP_Theme_Install_List_Table extends WP_List_Table {
$args = false;
}
if ( !$args )
if ( ! $args )
return;
$api = themes_api( 'query_themes', $args );
@ -108,6 +105,7 @@ class WP_Theme_Install_List_Table extends WP_List_Table {
$this->set_pagination_args( array(
'total_items' => $api->info['results'],
'per_page' => $per_page,
'infinite_scroll' => true,
) );
}
@ -128,12 +126,7 @@ class WP_Theme_Install_List_Table extends WP_List_Table {
return $display_tabs;
}
function get_columns() {
return array();
}
function display() {
wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
?>
<div class="tablenav top themes">
@ -149,12 +142,8 @@ class WP_Theme_Install_List_Table extends WP_List_Table {
<?php $this->display_rows_or_placeholder(); ?>
</div>
<div class="tablenav bottom themes">
<?php $this->pagination( 'bottom' ); ?>
<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
<br class="clear" />
</div>
<?php
<?php
parent::tablenav( 'bottom' );
}
function display_rows() {
@ -170,4 +159,18 @@ class WP_Theme_Install_List_Table extends WP_List_Table {
?></div>
<?php } // end foreach $theme_names
}
/**
* Send required variables to JavaScript land
*
* @since 3.4
* @access private
*
* @uses $tab Global; current tab within Themes->Install screen
* @uses $type Global; type of search.
*/
function _js_vars() {
global $tab, $type;
parent::_js_vars( compact( $tab, $type ) );
}
}