<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17364] trunk/wp-admin/themes.php: Fix theme filtering when no JS.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17364">17364</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-01-25 20:00:42 +0000 (Tue, 25 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix theme filtering when no JS. Props dd32. fixes <a href="http://trac.wordpress.org/ticket/14936">#14936</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (17363 => 17364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2011-01-25 19:36:50 UTC (rev 17363)
+++ trunk/wp-admin/themes.php 2011-01-25 20:00:42 UTC (rev 17364)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> <h3><?php _e('Available Themes'); ?></h3>
</span><span class="cx">
</span><del>-<?php if ( !empty( $_REQUEST['s'] ) || $wp_list_table->has_items() ) : ?>
</del><ins>+<?php if ( !empty( $_REQUEST['s'] ) || !empty( $_REQUEST['filter'] ) || $wp_list_table->has_items() ) : ?>
</ins><span class="cx">
</span><span class="cx"> <form class="search-form filter-form" action="" method="get">
</span><span class="cx">
</span><span class="lines">@@ -155,11 +155,13 @@
</span><span class="cx">
</span><span class="cx"> <br class="clear"/>
</span><span class="cx">
</span><del>-<div id="filter-box" style="display: none;">
</del><ins>+<div id="filter-box" style="<?php if ( empty($_REQUEST['filter']) ) echo 'display: none;'; ?>">
</ins><span class="cx"> <?php $feature_list = get_theme_feature_list(); ?>
</span><span class="cx"> <div class="feature-filter">
</span><span class="cx"> <p class="install-help"><?php _e('Theme filters') ?></p>
</span><del>-
</del><ins>+ <?php if ( !empty( $_REQUEST['filter'] ) ) : ?>
+ <input type="hidden" name="filter" value="1" />
+ <?php endif; ?>
</ins><span class="cx"> <?php foreach ( $feature_list as $feature_name => $features ) :
</span><span class="cx"> $feature_name = esc_html( $feature_name ); ?>
</span><span class="cx">
</span><span class="lines">@@ -184,20 +186,20 @@
</span><span class="cx"> <div class="feature-container">
</span><span class="cx"> <?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', 'submit', false, array( 'style' => 'margin-left: 120px' ) ); ?>
</span><span class="cx"> &nbsp;
</span><del>- <small><a id="mini-filter-click" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Close filters' )?></a></small>
</del><ins>+ <small><a id="mini-filter-click" href="<?php echo esc_url( remove_query_arg( array('filter', 'features', 'submit') ) ); ?>"><?php _e( 'Close filters' )?></a></small>
</ins><span class="cx"> </div>
</span><span class="cx"> <br/>
</span><span class="cx"> </div>
</span><span class="cx"> <br class="clear"/>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-</form>
</del><span class="cx"> <br class="clear" />
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php $wp_list_table->display(); ?>
</span><span class="cx">
</span><ins>+</form>
</ins><span class="cx"> <br class="clear" />
</span><span class="cx">
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>