<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[20097] trunk/wp-admin/includes/class-wp-theme-install-list-table.php: Revert [20096] which was an accidental partial revert of [20094].</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20097">20097</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-02 22:31:15 +0000 (Fri, 02 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://core.trac.wordpress.org/changeset/20096">[20096]</a> which was an accidental partial revert of <a href="http://core.trac.wordpress.org/changeset/20094">[20094]</a>. see <a href="http://core.trac.wordpress.org/ticket/19815">#19815</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpthemeinstalllisttablephp">trunk/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-theme-install-list-table.php (20096 => 20097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-03-02 22:26:58 UTC (rev 20096)
+++ trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-03-02 22:31:15 UTC (rev 20097)
</span><span class="lines">@@ -7,25 +7,30 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>-class WP_Theme_Install_List_Table extends WP_List_Table {
</del><ins>+class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
</ins><span class="cx">
</span><del>- function __construct() {
- parent::__construct( array(
- 'ajax' => true,
- ) );
- }
</del><ins>+ var $features = array();
</ins><span class="cx">
</span><span class="cx"> function ajax_user_can() {
</span><del>- return current_user_can('install_themes');
</del><ins>+ return current_user_can( 'install_themes' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function prepare_items() {
</span><span class="cx"> include( ABSPATH . 'wp-admin/includes/theme-install.php' );
</span><span class="cx">
</span><del>- global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;
-
</del><ins>+ global $tabs, $tab, $paged, $type, $theme_field_defaults;
</ins><span class="cx"> wp_reset_vars( array( 'tab' ) );
</span><span class="cx">
</span><ins>+ $search_terms = array();
+ $search_string = '';
+ if ( ! empty( $_REQUEST['s'] ) ){
+ $search_string = strtolower( stripslashes( $_REQUEST['s'] ) );
+ $search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
+ }
+
+ if ( ! empty( $_REQUEST['features'] ) )
+ $this->features = $_REQUEST['features'];
+
</ins><span class="cx"> $paged = $this->get_pagenum();
</span><span class="cx">
</span><span class="cx"> $per_page = 36;
</span><span class="lines">@@ -55,29 +60,21 @@
</span><span class="cx"> switch ( $tab ) {
</span><span class="cx"> case 'search':
</span><span class="cx"> $type = isset( $_REQUEST['type'] ) ? stripslashes( $_REQUEST['type'] ) : '';
</span><del>- $term = isset( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : '';
-
</del><span class="cx"> switch ( $type ) {
</span><span class="cx"> case 'tag':
</span><del>- $terms = explode( ',', $term );
- $terms = array_map( 'trim', $terms );
- $terms = array_map( 'sanitize_key', $terms );
- $args['tag'] = $terms;
</del><ins>+ $args['tag'] = array_map( 'sanitize_title_with_dashes', $search_terms );
</ins><span class="cx"> break;
</span><span class="cx"> case 'term':
</span><del>- $args['search'] = $term;
</del><ins>+ $args['search'] = $search_string;
</ins><span class="cx"> break;
</span><span class="cx"> case 'author':
</span><del>- $args['author'] = $term;
</del><ins>+ $args['author'] = $search_string;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $_REQUEST['features'] ) ) {
- $terms = $_REQUEST['features'];
- $terms = array_map( 'trim', $terms );
- $terms = array_map( 'sanitize_key', $terms );
- $args['tag'] = $terms;
- $_REQUEST['s'] = implode( ',', $terms );
</del><ins>+ if ( ! empty( $this->features ) ) {
+ $args['tag'] = $this->features;
+ $_REQUEST['s'] = implode( ',', $this->features );
</ins><span class="cx"> $_REQUEST['type'] = 'tag';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -95,7 +92,7 @@
</span><span class="cx"> $args = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !$args )
</del><ins>+ if ( ! $args )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $api = themes_api( 'query_themes', $args );
</span><span class="lines">@@ -108,6 +105,7 @@
</span><span class="cx"> $this->set_pagination_args( array(
</span><span class="cx"> 'total_items' => $api->info['results'],
</span><span class="cx"> 'per_page' => $per_page,
</span><ins>+ 'infinite_scroll' => true,
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -128,12 +126,7 @@
</span><span class="cx"> return $display_tabs;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_columns() {
- return array();
- }
-
</del><span class="cx"> function display() {
</span><del>-
</del><span class="cx"> wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="tablenav top themes">
</span><span class="lines">@@ -149,12 +142,8 @@
</span><span class="cx"> <?php $this->display_rows_or_placeholder(); ?>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="tablenav bottom themes">
- <?php $this->pagination( 'bottom' ); ?>
- <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
- <br class="clear" />
- </div>
-<?php
</del><ins>+ <?php
+ parent::tablenav( 'bottom' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function display_rows() {
</span><span class="lines">@@ -170,4 +159,18 @@
</span><span class="cx"> ?></div>
</span><span class="cx"> <?php } // end foreach $theme_names
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Send required variables to JavaScript land
+ *
+ * @since 3.4
+ * @access private
+ *
+ * @uses $tab Global; current tab within Themes->Install screen
+ * @uses $type Global; type of search.
+ */
+ function _js_vars() {
+ global $tab, $type;
+ parent::_js_vars( compact( $tab, $type ) );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>