WordPress 3.9.1-scripts

[autoinstalls/wordpress.git] / 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 f6ca8a5799e2f49a11a4c96680f246ef55f1a850..be75de02a673324a495e19f3e6b23f5277a31b2f 100644 (file)
--- 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 {
                ?>
                <div class="tablenav themes <?php echo $which; ?>">
                        <?php $this->pagination( $which ); ?>
-                  <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
-                 <br class="clear" />
+                       <span class="spinner"></span>
+                       <br class="clear" />
                </div>
                <?php
        }
@@ -113,6 +114,16 @@ class WP_Themes_List_Table extends WP_List_Table {
                return array();
        }
 
+       function display_rows_or_placeholder() {
+               if ( $this->has_items() ) {
+                       $this->display_rows();
+               } else {
+                       echo '<div class="no-items">';
+                       $this->no_items();
+                       echo '</div>';
+               }
+       }
+
        function display_rows() {
                $themes = $this->items;
 
@@ -143,11 +154,15 @@ class WP_Themes_List_Table extends WP_List_Table {
                                        . __( 'Live Preview' ) . '</a>';
 
                        if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
-                               $actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;stylesheet=$stylesheet", 'delete-theme_' . $stylesheet )
+                               $actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( 'themes.php?action=delete&amp;stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet )
                                        . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete." ), $title ) )
                                        . "' );" . '">' . __( 'Delete' ) . '</a>';
 
+                       /** 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'] ) ? '<div class="delete-theme">' . $actions['delete'] . '</div>' : '';
                        unset( $actions['delete'] );
 
@@ -171,7 +186,7 @@ class WP_Themes_List_Table extends WP_List_Table {
                                        <?php foreach ( $actions as $action ): ?>
                                                <li><?php echo $action; ?></li>
                                        <?php endforeach; ?>
-                                       <li class="hide-if-no-js"><a href="#" class="theme-detail" tabindex='4'><?php _e('Details') ?></a></li>
+                                       <li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e('Details') ?></a></li>
                                </ul>
                                <?php echo $delete_action; ?>
 
@@ -181,15 +196,11 @@ class WP_Themes_List_Table extends WP_List_Table {
                        <div class="themedetaildiv hide-if-js">
                                <p><strong><?php _e('Version: '); ?></strong><?php echo $version; ?></p>
                                <p><?php echo $theme->display('Description'); ?></p>
-                               <?php if ( current_user_can( 'edit_themes' ) && $theme->parent() ) :
-                                       /* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
-                                       <p><?php printf( __( 'The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. 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') ); ?></p>
-                               <?php else :
-                                               /* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir */ ?>
-                                       <p><?php printf( __( 'All of this theme&#8217;s files are located in <code>%2$s</code>.' ),
-                                               $title, str_replace( WP_CONTENT_DIR, '', $theme->get_template_directory() ), str_replace( WP_CONTENT_DIR, '', $theme->get_stylesheet_directory() ) ); ?></p>
-                               <?php endif; ?>
+                               <?php if ( $theme->parent() ) {
+                                       printf( ' <p class="howto">' . __( 'This <a href="%1$s">child theme</a> requires its parent theme, %2$s.' ) . '</p>',
+                                               __( 'http://codex.wordpress.org/Child_Themes' ),
+                                               $theme->parent()->display( 'Name' ) );
+                               } ?>
                        </div>
 
                        </div>
@@ -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,