Wordpress 3.7

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-theme-install-list-table.php

diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-theme-install-list-table.php
index 319a9989f12d1142153f4cb9c0fbc3ad8ce06877..bb8328fb1b62890ad932c83af3d10ad30211f99a 100644 (file)
--- a/wp-admin/includes/class-wp-theme-install-list-table.php
+++ b/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -24,7 +24,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                $search_terms = array();
                $search_string = '';
                if ( ! empty( $_REQUEST['s'] ) ){
-                       $search_string = strtolower( stripslashes( $_REQUEST['s'] ) );
+                       $search_string = strtolower( wp_unslash( $_REQUEST['s'] ) );
                        $search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
                }
 
@@ -51,7 +51,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
                $tabs = apply_filters( 'install_themes_tabs', $tabs );
                $nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
 
-               // If a non-valid menu tab has been selected, And its not a non-menu action.
+               // If a non-valid menu tab has been selected, And it's not a non-menu action.
                if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) )
                        $tab = key( $tabs );
 
@@ -59,7 +59,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
                switch ( $tab ) {
                        case 'search':
-                               $type = isset( $_REQUEST['type'] ) ? stripslashes( $_REQUEST['type'] ) : 'term';
+                               $type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
                                switch ( $type ) {
                                        case 'tag':
                                                $args['tag'] = array_map( 'sanitize_key', $search_terms );
@@ -90,8 +90,11 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
                        default:
                                $args = false;
+                               break;
                }
 
+               $args = apply_filters( 'install_themes_table_api_args_' . $tab, $args );
+
                if ( ! $args )
                        return;
 
@@ -164,17 +167,17 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
         *
         * Example theme data:
         *   object(stdClass)[59]
-        *     public 'name' => string 'Magazine Basic' (length=14)
-        *     public 'slug' => string 'magazine-basic' (length=14)
-        *     public 'version' => string '1.1' (length=3)
-        *     public 'author' => string 'tinkerpriest' (length=12)
-        *     public 'preview_url' => string 'http://wp-themes.com/?magazine-basic' (length=36)
-        *     public 'screenshot_url' => string 'http://wp-themes.com/wp-content/themes/magazine-basic/screenshot.png' (length=68)
+        *     public 'name' => string 'Magazine Basic'
+        *     public 'slug' => string 'magazine-basic'
+        *     public 'version' => string '1.1'
+        *     public 'author' => string 'tinkerpriest'
+        *     public 'preview_url' => string 'http://wp-themes.com/?magazine-basic'
+        *     public 'screenshot_url' => string 'http://wp-themes.com/wp-content/themes/magazine-basic/screenshot.png'
         *     public 'rating' => float 80
         *     public 'num_ratings' => int 1
-        *     public 'homepage' => string 'http://wordpress.org/extend/themes/magazine-basic' (length=49)
-        *     public 'description' => string 'A basic magazine style layout with a fully customizable layout through a backend interface. Designed by <a href="http://bavotasan.com">c.bavota</a> of <a href="http://tinkerpriestmedia.com">Tinker Priest Media</a>.' (length=214)
-        *     public 'download_link' => string 'http://wordpress.org/extend/themes/download/magazine-basic.1.1.zip' (length=66)
+        *     public 'homepage' => string 'http://wordpress.org/themes/magazine-basic'
+        *     public 'description' => string 'A basic magazine style layout with a fully customizable layout through a backend interface. Designed by <a href="http://bavotasan.com">c.bavota</a> of <a href="http://tinkerpriestmedia.com">Tinker Priest Media</a>.'
+        *     public 'download_link' => string 'http://wordpress.org/themes/download/magazine-basic.1.1.zip'
         */
        function single_row( $theme ) {
                global $themes_allowedtags;
@@ -362,7 +365,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
         * @uses $tab Global; current tab within Themes->Install screen
         * @uses $type Global; type of search.
         */
-       function _js_vars() {
+       function _js_vars( $extra_args = array() ) {
                global $tab, $type;
                parent::_js_vars( compact( 'tab', 'type' ) );
        }