Wordpress 3.7

[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 420495efe3fa5e7f3057ec66ec2c0c222cacc9cc..d49d9930b9555607f3b1f996131d4c28ef0f5fb4 100644 (file)
--- a/wp-admin/includes/class-wp-themes-list-table.php
+++ b/wp-admin/includes/class-wp-themes-list-table.php
@@ -28,7 +28,7 @@ class WP_Themes_List_Table extends WP_List_Table {
                $themes = wp_get_themes( array( 'allowed' => true ) );
 
                if ( ! empty( $_REQUEST['s'] ) )
                $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'];
 
                if ( ! empty( $_REQUEST['features'] ) )
                        $this->features = $_REQUEST['features'];


@@ -114,6 +114,16 @@ class WP_Themes_List_Table extends WP_List_Table {
                return array();
        }
 
                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;
 
        function display_rows() {
                $themes = $this->items;
 


@@ -149,6 +159,7 @@ class WP_Themes_List_Table extends WP_List_Table {
                                        . "' );" . '">' . __( 'Delete' ) . '</a>';
 
                        $actions       = apply_filters( 'theme_action_links', $actions, $theme );
                                        . "' );" . '">' . __( 'Delete' ) . '</a>';
 
                        $actions       = apply_filters( 'theme_action_links', $actions, $theme );

+                       $actions       = apply_filters( "theme_action_links_$stylesheet", $actions, $theme );

                        $delete_action = isset( $actions['delete'] ) ? '<div class="delete-theme">' . $actions['delete'] . '</div>' : '';
                        unset( $actions['delete'] );
 
                        $delete_action = isset( $actions['delete'] ) ? '<div class="delete-theme">' . $actions['delete'] . '</div>' : '';
                        unset( $actions['delete'] );
 


@@ -235,7 +246,7 @@ class WP_Themes_List_Table extends WP_List_Table {
         * @uses _pagination_args['total_pages']
         */
         function _js_vars( $extra_args = array() ) {
         * @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,
 
                $args = array(
                        'search' => $search_string,