Index: src/wp-admin/includes/ajax-actions.php
===================================================================
--- src/wp-admin/includes/ajax-actions.php (revision 29165)
+++ src/wp-admin/includes/ajax-actions.php (working copy)
@@ -2577,7 +2577,17 @@
$old_filter = isset( $args['browse'] ) ? $args['browse'] : 'search';
- /** This filter is documented in wp-admin/includes/class-wp-theme-install-list-table.php */
+ /**
+ * Filter API request arguments for each Install Themes screen tab.
+ *
+ * The dynamic portion of the hook name, $tab, refers to the theme install
+ * tabs. Default tabs are 'dashboard', 'search', 'upload', 'featured',
+ * 'new', and 'updated'.
+ *
+ * @since 3.7.0
+ *
+ * @param array $args An array of themes API arguments.
+ */
$args = apply_filters( 'install_themes_table_api_args_' . $old_filter, $args );
$api = themes_api( 'query_themes', $args );
Index: src/wp-admin/includes/class-wp-theme-install-list-table.php
===================================================================
--- src/wp-admin/includes/class-wp-theme-install-list-table.php (revision 29165)
+++ src/wp-admin/includes/class-wp-theme-install-list-table.php (working copy)
@@ -1,433 +0,0 @@
-features = $_REQUEST['features'];
-
- $paged = $this->get_pagenum();
-
- $per_page = 36;
-
- // These are the tabs which are shown on the page,
- $tabs = array();
- $tabs['dashboard'] = __( 'Search' );
- if ( 'search' == $tab )
- $tabs['search'] = __( 'Search Results' );
- $tabs['upload'] = __( 'Upload' );
- $tabs['featured'] = _x( 'Featured', 'themes' );
- //$tabs['popular'] = _x( 'Popular', 'themes' );
- $tabs['new'] = _x( 'Latest', 'themes' );
- $tabs['updated'] = _x( 'Recently Updated', 'themes' );
-
- $nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
-
- /** This filter is documented in wp-admin/theme-install.php */
- $tabs = apply_filters( 'install_themes_tabs', $tabs );
-
- /**
- * Filter tabs not associated with a menu item on the Install Themes screen.
- *
- * @since 2.8.0
- *
- * @param array $nonmenu_tabs The tabs that don't have a menu item on
- * the Install Themes screen.
- */
- $nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
-
- // If a non-valid menu tab has been selected, And it's not a non-menu action.
- if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) )
- $tab = key( $tabs );
-
- $args = array( 'page' => $paged, 'per_page' => $per_page, 'fields' => $theme_field_defaults );
-
- switch ( $tab ) {
- case 'search':
- $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
- switch ( $type ) {
- case 'tag':
- $args['tag'] = array_map( 'sanitize_key', $search_terms );
- break;
- case 'term':
- $args['search'] = $search_string;
- break;
- case 'author':
- $args['author'] = $search_string;
- break;
- }
-
- if ( ! empty( $this->features ) ) {
- $args['tag'] = $this->features;
- $_REQUEST['s'] = implode( ',', $this->features );
- $_REQUEST['type'] = 'tag';
- }
-
- add_action( 'install_themes_table_header', 'install_theme_search_form', 10, 0 );
- break;
-
- case 'featured':
- //case 'popular':
- case 'new':
- case 'updated':
- $args['browse'] = $tab;
- break;
-
- default:
- $args = false;
- break;
- }
-
- /**
- * Filter API request arguments for each Install Themes screen tab.
- *
- * The dynamic portion of the hook name, $tab, refers to the theme install
- * tabs. Default tabs are 'dashboard', 'search', 'upload', 'featured',
- * 'new', and 'updated'.
- *
- * @since 3.7.0
- *
- * @param array $args An array of themes API arguments.
- */
- $args = apply_filters( 'install_themes_table_api_args_' . $tab, $args );
-
- if ( ! $args )
- return;
-
- $api = themes_api( 'query_themes', $args );
-
- if ( is_wp_error( $api ) )
- wp_die( $api->get_error_message() . '
' . __( 'Try again' ) . '' );
-
- $this->items = $api->themes;
-
- $this->set_pagination_args( array(
- 'total_items' => $api->info['results'],
- 'per_page' => $args['per_page'],
- 'infinite_scroll' => true,
- ) );
- }
-
- public function no_items() {
- _e( 'No themes match your request.' );
- }
-
- protected function get_views() {
- global $tabs, $tab;
-
- $display_tabs = array();
- foreach ( (array) $tabs as $action => $text ) {
- $class = ( $action == $tab ) ? ' class="current"' : '';
- $href = self_admin_url('theme-install.php?tab=' . $action);
- $display_tabs['theme-install-'.$action] = "$text";
- }
-
- return $display_tabs;
- }
-
- public function display() {
- wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
-?>
-
-
-
-
- pagination( 'top' ); ?>
-
-
-
-
- display_rows_or_placeholder(); ?>
-
-
- items;
- foreach ( $themes as $theme ) {
- ?>
- single_row( $theme );
- ?>
- theme_installer();
- }
-
- /**
- * Prints a theme from the WordPress.org API.
- *
- * @param object $theme An object that contains theme data returned by the WordPress.org API.
- *
- * Example theme data:
- * object(stdClass)[59]
- * public 'name' => string 'Magazine Basic'
- * public 'slug' => string 'magazine-basic'
- * public 'version' => string '1.1'
- * public 'author' => string 'tinkerpriest'
- * public 'preview_url' => string 'http://wp-themes.com/?magazine-basic'
- * public 'screenshot_url' => string 'http://wp-themes.com/wp-content/themes/magazine-basic/screenshot.png'
- * public 'rating' => float 80
- * public 'num_ratings' => int 1
- * public 'homepage' => string 'http://wordpress.org/themes/magazine-basic'
- * public 'description' => string 'A basic magazine style layout with a fully customizable layout through a backend interface. Designed by c.bavota of Tinker Priest Media.'
- * public 'download_link' => string 'http://wordpress.org/themes/download/magazine-basic.1.1.zip'
- */
- public function single_row( $theme ) {
- global $themes_allowedtags;
-
- if ( empty( $theme ) )
- return;
-
- $name = wp_kses( $theme->name, $themes_allowedtags );
- $author = wp_kses( $theme->author, $themes_allowedtags );
-
- $preview_title = sprintf( __('Preview “%s”'), $name );
- $preview_url = add_query_arg( array(
- 'tab' => 'theme-information',
- 'theme' => $theme->slug,
- ), self_admin_url( 'theme-install.php' ) );
-
- $actions = array();
-
- $install_url = add_query_arg( array(
- 'action' => 'install-theme',
- 'theme' => $theme->slug,
- ), self_admin_url( 'update.php' ) );
-
- $update_url = add_query_arg( array(
- 'action' => 'upgrade-theme',
- 'theme' => $theme->slug,
- ), self_admin_url( 'update.php' ) );
-
- $status = $this->_get_theme_status( $theme );
-
- switch ( $status ) {
- case 'update_available':
- $actions[] = '' . __( 'Update' ) . '';
- break;
- case 'newer_installed':
- case 'latest_installed':
- $actions[] = '' . _x( 'Installed', 'theme' ) . '';
- break;
- case 'install':
- default:
- $actions[] = '' . __( 'Install Now' ) . '';
- break;
- }
-
- $actions[] = '' . __( 'Preview' ) . '';
-
- /**
- * Filter the install action links for a theme in the Install Themes list table.
- *
- * @since 3.4.0
- *
- * @param array $actions An array of theme action hyperlinks. Defaults are
- * links to Install Now, Preview, and Details.
- * @param WP_Theme $theme Theme object.
- */
- $actions = apply_filters( 'theme_install_actions', $actions, $theme );
-
- ?>
-
-
-
-
-
-
-
-
-
- install_theme_info( $theme );
- }
-
- /**
- * Prints the wrapper for the theme installer.
- */
- public function theme_installer() {
- ?>
-
-
-
- name, $themes_allowedtags );
- $author = wp_kses( $theme->author, $themes_allowedtags );
-
- $num_ratings = sprintf( _n( '(based on %s rating)', '(based on %s ratings)', $theme->num_ratings ), number_format_i18n( $theme->num_ratings ) );
-
- $install_url = add_query_arg( array(
- 'action' => 'install-theme',
- 'theme' => $theme->slug,
- ), self_admin_url( 'update.php' ) );
-
- $update_url = add_query_arg( array(
- 'action' => 'upgrade-theme',
- 'theme' => $theme->slug,
- ), self_admin_url( 'update.php' ) );
-
- $status = $this->_get_theme_status( $theme );
-
- ?>
- slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '';
- break;
- case 'newer_installed':
- case 'latest_installed':
- echo '
' . _x( 'Installed', 'theme' ) . '';
- break;
- case 'install':
- default:
- echo '
' . __( 'Install' ) . '';
- break;
- } ?>
-
-
- screenshot_url ) ): ?>
-
-
-
- $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings ) ); ?>
-
-
- version, $themes_allowedtags ); ?>
-
-
- description, $themes_allowedtags ); ?>
-
-
-
-
- Install screen
- * @uses $type Global; type of search.
- */
- public function _js_vars( $extra_args = array() ) {
- global $tab, $type;
- parent::_js_vars( compact( 'tab', 'type' ) );
- }
-
- /**
- * Check to see if the theme is already installed.
- *
- * @since 3.4.0
- * @access private
- *
- * @param object $theme - A WordPress.org Theme API object.
- * @return string Theme status.
- */
- private function _get_theme_status( $theme ) {
- $status = 'install';
-
- $installed_theme = wp_get_theme( $theme->slug );
- if ( $installed_theme->exists() ) {
- if ( version_compare( $installed_theme->get('Version'), $theme->version, '=' ) )
- $status = 'latest_installed';
- elseif ( version_compare( $installed_theme->get('Version'), $theme->version, '>' ) )
- $status = 'newer_installed';
- else
- $status = 'update_available';
- }
-
- return $status;
- }
-}