diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/includes/class-wp-themes-list-table.php --- a/wp/wp-admin/includes/class-wp-themes-list-table.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/includes/class-wp-themes-list-table.php Mon Oct 14 18:28:13 2019 +0200 @@ -18,7 +18,7 @@ class WP_Themes_List_Table extends WP_List_Table { protected $search_terms = array(); - public $features = array(); + public $features = array(); /** * Constructor. @@ -30,14 +30,15 @@ * @param array $args An associative array of arguments. */ public function __construct( $args = array() ) { - parent::__construct( array( - 'ajax' => true, - 'screen' => isset( $args['screen'] ) ? $args['screen'] : null, - ) ); + parent::__construct( + array( + 'ajax' => true, + 'screen' => isset( $args['screen'] ) ? $args['screen'] : null, + ) + ); } /** - * * @return bool */ public function ajax_user_can() { @@ -50,16 +51,19 @@ public function prepare_items() { $themes = wp_get_themes( array( 'allowed' => true ) ); - if ( ! empty( $_REQUEST['s'] ) ) + if ( ! empty( $_REQUEST['s'] ) ) { $this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( wp_unslash( $_REQUEST['s'] ) ) ) ) ) ); + } - if ( ! empty( $_REQUEST['features'] ) ) + if ( ! empty( $_REQUEST['features'] ) ) { $this->features = $_REQUEST['features']; + } if ( $this->search_terms || $this->features ) { foreach ( $themes as $key => $theme ) { - if ( ! $this->search_theme( $theme ) ) + if ( ! $this->search_theme( $theme ) ) { unset( $themes[ $key ] ); + } } } @@ -67,17 +71,19 @@ WP_Theme::sort_by_name( $themes ); $per_page = 36; - $page = $this->get_pagenum(); + $page = $this->get_pagenum(); $start = ( $page - 1 ) * $per_page; $this->items = array_slice( $themes, $start, $per_page, true ); - $this->set_pagination_args( array( - 'total_items' => count( $themes ), - 'per_page' => $per_page, - 'infinite_scroll' => true, - ) ); + $this->set_pagination_args( + array( + 'total_items' => count( $themes ), + 'per_page' => $per_page, + 'infinite_scroll' => true, + ) + ); } /** @@ -115,8 +121,9 @@ * @param string $which */ public function tablenav( $which = 'top' ) { - if ( $this->get_pagination_arg( 'total_pages' ) <= 1 ) + if ( $this->get_pagination_arg( 'total_pages' ) <= 1 ) { return; + } ?>
pagination( $which ); ?> @@ -129,8 +136,8 @@ /** */ public function display() { - wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' ); -?> + wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' ); + ?> tablenav( 'top' ); ?>
@@ -138,11 +145,10 @@
tablenav( 'bottom' ); ?> -items; - foreach ( $themes as $theme ): - ?>
+
+ get_template(); $stylesheet = $theme->get_stylesheet(); - $title = $theme->display('Name'); - $version = $theme->display('Version'); - $author = $theme->display('Author'); + $title = $theme->display( 'Name' ); + $version = $theme->display( 'Version' ); + $author = $theme->display( 'Author' ); - $activate_link = wp_nonce_url( "themes.php?action=activate&template=" . urlencode( $template ) . "&stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $stylesheet ); + $activate_link = wp_nonce_url( 'themes.php?action=activate&template=' . urlencode( $template ) . '&stylesheet=' . urlencode( $stylesheet ), 'switch-theme_' . $stylesheet ); - $actions = array(); + $actions = array(); $actions['activate'] = '' . __( 'Activate' ) . ''; @@ -186,13 +194,14 @@ . __( 'Live Preview' ) . ''; } - if ( ! is_multisite() && current_user_can( 'delete_themes' ) ) + if ( ! is_multisite() && current_user_can( 'delete_themes' ) ) { $actions['delete'] = '' . __( 'Delete' ) . ''; + } /** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */ - $actions = apply_filters( 'theme_action_links', $actions, $theme, 'all' ); + $actions = apply_filters( 'theme_action_links', $actions, $theme, 'all' ); /** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */ $actions = apply_filters( "theme_action_links_$stylesheet", $actions, $theme, 'all' ); @@ -216,10 +225,10 @@
-

-

display('Description'); ?>

- parent() ) { - printf( '

' . __( 'This child theme requires its parent theme, %2$s.' ) . '

', - __( 'https://codex.wordpress.org/Child_Themes' ), - $theme->parent()->display( 'Name' ) ); - } ?> +

+

display( 'Description' ); ?>

+ parent() ) { + printf( + /* translators: %s: link to documentation on child themes */ + '

' . __( 'This child theme requires its parent theme, %2$s.' ) . '

', + __( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ), + $theme->parent()->display( 'Name' ) + ); + } + ?>
- features as $word ) { - if ( ! in_array( $word, $theme->get('Tags') ) ) + if ( ! in_array( $word, $theme->get( 'Tags' ) ) ) { return false; + } } // Match all phrases foreach ( $this->search_terms as $word ) { - if ( in_array( $word, $theme->get('Tags') ) ) + if ( in_array( $word, $theme->get( 'Tags' ) ) ) { continue; + } foreach ( array( 'Name', 'Description', 'Author', 'AuthorURI' ) as $header ) { // Don't mark up; Do translate. @@ -264,11 +280,13 @@ } } - if ( false !== stripos( $theme->get_stylesheet(), $word ) ) + if ( false !== stripos( $theme->get_stylesheet(), $word ) ) { continue; + } - if ( false !== stripos( $theme->get_template(), $word ) ) + if ( false !== stripos( $theme->get_template(), $word ) ) { continue; + } return false; } @@ -287,14 +305,15 @@ $search_string = isset( $_REQUEST['s'] ) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : ''; $args = array( - 'search' => $search_string, - 'features' => $this->features, - 'paged' => $this->get_pagenum(), + 'search' => $search_string, + 'features' => $this->features, + 'paged' => $this->get_pagenum(), 'total_pages' => ! empty( $this->_pagination_args['total_pages'] ) ? $this->_pagination_args['total_pages'] : 1, ); - if ( is_array( $extra_args ) ) + if ( is_array( $extra_args ) ) { $args = array_merge( $args, $extra_args ); + } printf( "\n", wp_json_encode( $args ) ); parent::_js_vars();