<!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>[17038] trunk/wp-admin: Search query string tweaks for net plugins.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17038">17038</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-17 23:47:40 +0000 (Fri, 17 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Search query string tweaks for net plugins. Props PeteMall. see <a href="http://trac.wordpress.org/ticket/15872">#15872</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppluginslisttablephp">trunk/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (17037 => 17038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2010-12-17 23:34:10 UTC (rev 17037)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2010-12-17 23:47:40 UTC (rev 17038)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx">
</span><span class="cx"> echo "<ul class='subsubsub'>\n";
</span><span class="cx"> foreach ( $views as $class => $view ) {
</span><del>- $views[ $class ] = "\t<li class='$class'>$view";
</del><ins>+ $views[ $class ] = "\t<li class='$class'>$view";
</ins><span class="cx"> }
</span><span class="cx"> echo implode( " |</li>\n", $views ) . "</li>\n";
</span><span class="cx"> echo "</ul>";
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugins-list-table.php (17037 => 17038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugins-list-table.php 2010-12-17 23:34:10 UTC (rev 17037)
+++ trunk/wp-admin/includes/class-wp-plugins-list-table.php 2010-12-17 23:47:40 UTC (rev 17038)
</span><span class="lines">@@ -232,16 +232,15 @@
</span><span class="cx"> case 'upgrade':
</span><span class="cx"> $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
</span><span class="cx"> break;
</span><del>- case 'search':
- $text = _n( 'Search Results <span class="count">(%s)</span>', 'Search Results <span class="count">(%s)</span>', $count );
- break;
</del><span class="cx"> }
</span><del>-
- $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
- add_query_arg('plugin_status', $type, 'plugins.php'),
- ( $type == $status ) ? ' class="current"' : '',
- sprintf( $text, number_format_i18n( $count ) )
- );
</del><ins>+
+ if ( 'search' != $type ) {
+ $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
+ add_query_arg('plugin_status', $type, 'plugins.php'),
+ ( $type == $status ) ? ' class="current"' : '',
+ sprintf( $text, number_format_i18n( $count ) )
+ );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $status_links;
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (17037 => 17038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-12-17 23:34:10 UTC (rev 17037)
+++ trunk/wp-admin/plugins.php 2010-12-17 23:47:40 UTC (rev 17038)
</span><span class="lines">@@ -384,7 +384,10 @@
</span><span class="cx"> <h2><?php echo esc_html( $title );
</span><span class="cx"> if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
</span><span class="cx"> <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
</span><del>-<?php } ?></h2>
</del><ins>+<?php }
+if ( $s )
+ printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
+</h2>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'pre_current_active_plugins', $plugins['all'] ) ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>