X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/80b7979fccf09a75af3f4c111fa27060ae6dbf85..888fa4ed68091f3314f711c5f6fe75858bf5410b:/wp-admin/includes/class-wp-themes-list-table.php
diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php
index 003d1ab0..be75de02 100644
--- a/wp-admin/includes/class-wp-themes-list-table.php
+++ b/wp-admin/includes/class-wp-themes-list-table.php
@@ -12,9 +12,10 @@ class WP_Themes_List_Table extends WP_List_Table {
protected $search_terms = array();
var $features = array();
- function __construct() {
+ function __construct( $args = array() ) {
parent::__construct( array(
'ajax' => true,
+ 'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
) );
}
@@ -27,7 +28,7 @@ class WP_Themes_List_Table extends WP_List_Table {
$themes = wp_get_themes( array( 'allowed' => true ) );
if ( ! empty( $_REQUEST['s'] ) )
- $this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( stripslashes( $_REQUEST['s'] ) ) ) ) ) );
+ $this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( wp_unslash( $_REQUEST['s'] ) ) ) ) ) );
if ( ! empty( $_REQUEST['features'] ) )
$this->features = $_REQUEST['features'];
@@ -42,7 +43,7 @@ class WP_Themes_List_Table extends WP_List_Table {
unset( $themes[ get_option( 'stylesheet' ) ] );
WP_Theme::sort_by_name( $themes );
- $per_page = 999;
+ $per_page = 36;
$page = $this->get_pagenum();
$start = ( $page - 1 ) * $per_page;
@@ -90,8 +91,8 @@ class WP_Themes_List_Table extends WP_List_Table {
?>
pagination( $which ); ?>
-
-
+
+
has_items() ) {
+ $this->display_rows();
+ } else {
+ echo '';
+ $this->no_items();
+ echo '
';
+ }
+ }
+
function display_rows() {
$themes = $this->items;
@@ -128,7 +139,7 @@ class WP_Themes_List_Table extends WP_List_Table {
$activate_link = wp_nonce_url( "themes.php?action=activate&template=" . urlencode( $template ) . "&stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $stylesheet );
$preview_link = esc_url( add_query_arg(
- array( 'preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => true, 'TB_iframe' => 'true' ),
+ array( 'preview' => 1, 'template' => urlencode( $template ), 'stylesheet' => urlencode( $stylesheet ), 'preview_iframe' => true, 'TB_iframe' => 'true' ),
home_url( '/' ) ) );
$actions = array();
@@ -143,11 +154,15 @@ class WP_Themes_List_Table extends WP_List_Table {
. __( 'Live Preview' ) . '';
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 );
+
+ /** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
+ $actions = apply_filters( "theme_action_links_$stylesheet", $actions, $theme );
$delete_action = isset( $actions['delete'] ) ? '' . $actions['delete'] . '
' : '';
unset( $actions['delete'] );
@@ -171,7 +186,7 @@ class WP_Themes_List_Table extends WP_List_Table {
-
+
@@ -181,15 +196,11 @@ class WP_Themes_List_Table extends WP_List_Table {
display('Description'); ?>
- parent() ) :
- /* translators: 1: theme title, 2: template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
-
%2$s. The stylesheet files are located in %3$s
. %4$s uses templates from %5$s. Changes made to the templates will affect both themes.' ),
- $title, str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ), $title, $theme->parent()->display('Name') ); ?>
-
-
%2$s.' ),
- $title, str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ) ); ?>
-
+ parent() ) {
+ printf( '
' . __( 'This child theme requires its parent theme, %2$s.' ) . '
',
+ __( 'http://codex.wordpress.org/Child_Themes' ),
+ $theme->parent()->display( 'Name' ) );
+ } ?>
@@ -211,8 +222,9 @@ class WP_Themes_List_Table extends WP_List_Table {
foreach ( array( 'Name', 'Description', 'Author', 'AuthorURI' ) as $header ) {
// Don't mark up; Do translate.
- if ( false !== stripos( $theme->display( $header, false, true ), $word ) )
+ if ( false !== stripos( strip_tags( $theme->display( $header, false, true ) ), $word ) ) {
continue 2;
+ }
}
if ( false !== stripos( $theme->get_stylesheet(), $word ) )
@@ -230,7 +242,7 @@ class WP_Themes_List_Table extends WP_List_Table {
/**
* Send required variables to JavaScript land
*
- * @since 3.4
+ * @since 3.4.0
* @access private
*
* @uses $this->features Array of all feature search terms.
@@ -238,7 +250,7 @@ class WP_Themes_List_Table extends WP_List_Table {
* @uses _pagination_args['total_pages']
*/
function _js_vars( $extra_args = array() ) {
- $search_string = isset( $_REQUEST['s'] ) ? esc_attr( stripslashes( $_REQUEST['s'] ) ) : '';
+ $search_string = isset( $_REQUEST['s'] ) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
$args = array(
'search' => $search_string,