X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..5d244c8fd9a27c9f89dd08da2af6fbc67d4fce63:/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..6311e755 100644
--- a/wp-admin/includes/class-wp-themes-list-table.php
+++ b/wp-admin/includes/class-wp-themes-list-table.php
@@ -10,24 +10,35 @@
class WP_Themes_List_Table extends WP_List_Table {
protected $search_terms = array();
- var $features = array();
+ public $features = array();
- function __construct() {
+ /**
+ * Constructor.
+ *
+ * @since 3.1.0
+ * @access public
+ *
+ * @see WP_List_Table::__construct() for more information on default arguments.
+ *
+ * @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,
) );
}
- function ajax_user_can() {
+ public function ajax_user_can() {
// Do not check edit_theme_options here. AJAX calls for available themes require switch_themes.
return current_user_can( 'switch_themes' );
}
- function prepare_items() {
+ public function prepare_items() {
$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 +53,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;
@@ -56,7 +67,7 @@ class WP_Themes_List_Table extends WP_List_Table {
) );
}
- function no_items() {
+ public function no_items() {
if ( $this->search_terms || $this->features ) {
_e( 'No items found.' );
return;
@@ -72,7 +83,7 @@ class WP_Themes_List_Table extends WP_List_Table {
return;
}
- // else, fallthrough. install_themes doesn't help if you can't enable it.
+ // Else, fallthrough. install_themes doesn't help if you can't enable it.
} else {
if ( current_user_can( 'install_themes' ) ) {
printf( __( 'You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the Install Themes tab above.' ), admin_url( 'theme-install.php' ) );
@@ -84,19 +95,23 @@ class WP_Themes_List_Table extends WP_List_Table {
printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
}
- function tablenav( $which = 'top' ) {
+ /**
+ * @param string $which
+ * @return null
+ */
+ public function tablenav( $which = 'top' ) {
if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
return;
?>
pagination( $which ); ?>
-
-
+
+
tablenav( 'top' ); ?>
@@ -109,11 +124,21 @@ class WP_Themes_List_Table extends WP_List_Table {
has_items() ) {
+ $this->display_rows();
+ } else {
+ echo '';
+ $this->no_items();
+ echo '
';
+ }
+ }
+
+ public function display_rows() {
$themes = $this->items;
foreach ( $themes as $theme ):
@@ -128,7 +153,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();
@@ -138,16 +163,21 @@ class WP_Themes_List_Table extends WP_List_Table {
$actions['preview'] = '' . __( 'Preview' ) . '';
- if ( current_user_can( 'edit_theme_options' ) )
+ if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
$actions['preview'] .= ''
. __( '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 +201,7 @@ class WP_Themes_List_Table extends WP_List_Table {
-
+
@@ -179,17 +209,13 @@ 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' ) );
+ } ?>
@@ -197,7 +223,11 @@ class WP_Themes_List_Table extends WP_List_Table {
endforeach;
}
- function search_theme( $theme ) {
+ /**
+ * @param WP_Theme $theme
+ * @return bool
+ */
+ public function search_theme( $theme ) {
// Search the features
foreach ( $this->features as $word ) {
if ( ! in_array( $word, $theme->get('Tags') ) )
@@ -211,8 +241,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,15 +261,13 @@ class WP_Themes_List_Table extends WP_List_Table {
/**
* Send required variables to JavaScript land
*
- * @since 3.4
- * @access private
+ * @since 3.4.0
+ * @access public
*
- * @uses $this->features Array of all feature search terms.
- * @uses get_pagenum()
- * @uses _pagination_args['total_pages']
+ * @param array $extra_args
*/
- function _js_vars( $extra_args = array() ) {
- $search_string = isset( $_REQUEST['s'] ) ? esc_attr( stripslashes( $_REQUEST['s'] ) ) : '';
+ public function _js_vars( $extra_args = array() ) {
+ $search_string = isset( $_REQUEST['s'] ) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
$args = array(
'search' => $search_string,
@@ -250,7 +279,7 @@ class WP_Themes_List_Table extends WP_List_Table {
if ( is_array( $extra_args ) )
$args = array_merge( $args, $extra_args );
- printf( "\n", json_encode( $args ) );
+ printf( "\n", wp_json_encode( $args ) );
parent::_js_vars();
}
}