<!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>[17806] trunk/wp-admin: * Allow Pagination for Must-Use/Dropin plugins</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://trac.wordpress.org/changeset/17806">17806</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-05-05 05:24:15 +0000 (Thu, 05 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre> * Allow Pagination for Must-Use/Dropin plugins
* Respect WP_CONTENT_DIR & WPMU_PLUGIN_DIR for help text
* Move help text into WP_Plugins_List_Table
See <a href="http://trac.wordpress.org/ticket/17327">#17327</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugins-list-table.php (17805 => 17806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugins-list-table.php 2011-05-05 04:08:22 UTC (rev 17805)
+++ trunk/wp-admin/includes/class-wp-plugins-list-table.php 2011-05-05 05:24:15 UTC (rev 17806)
</span><span class="lines">@@ -195,13 +195,6 @@
</span><span class="cx"> return array();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function display_tablenav( $which ) {
- global $status;
-
- if ( !in_array( $status, array( 'mustuse', 'dropins' ) ) )
- parent::display_tablenav( $which );
- }
-
</del><span class="cx"> function get_views() {
</span><span class="cx"> global $totals, $status;
</span><span class="cx">
</span><span class="lines">@@ -286,11 +279,19 @@
</span><span class="cx"> function extra_tablenav( $which ) {
</span><span class="cx"> global $status;
</span><span class="cx">
</span><del>- if ( 'recently_activated' == $status ) { ?>
- <div class="alignleft actions">
- <?php submit_button( __( 'Clear List' ), 'secondary', 'clear-recent-list', false ); ?>
- </div>
- <?php }
</del><ins>+ if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
+ return;
+
+ echo '<div class="alignleft actions">';
+
+ if ( 'recently_activated' == $status )
+ submit_button( __( 'Clear List' ), 'secondary', 'clear-recent-list', false );
+ elseif ( 'top' == $which && 'mustuse' == $status )
+ echo '<p>' . sprintf( __( 'Files in the <code>%s</code> directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '</p>';
+ elseif ( 'top' == $which && 'dropins' == $status )
+ echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the <code>%s</code> directory that replace WordPress functionality when present.' ), str_replace( ABSPATH, '', WP_CONTENT_DIR ) ) . '</p>';
+
+ echo '</div>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function current_action() {
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (17805 => 17806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2011-05-05 04:08:22 UTC (rev 17805)
+++ trunk/wp-admin/plugins.php 2011-05-05 05:24:15 UTC (rev 17806)
</span><span class="lines">@@ -405,13 +405,6 @@
</span><span class="cx"> <input type="hidden" name="plugin_status" value="<?php echo esc_attr($status) ?>" />
</span><span class="cx"> <input type="hidden" name="paged" value="<?php echo esc_attr($page) ?>" />
</span><span class="cx">
</span><del>-<?php
-if ( 'mustuse' == $status )
- echo '<br class="clear" /><p>' . __( 'Files in the <code>/wp-content/mu-plugins</code> directory are executed automatically.' ) . '</p>';
-elseif ( 'dropins' == $status )
- echo '<br class="clear" /><p>' . __( 'Drop-ins are advanced plugins in the <code>/wp-content</code> directory that replace WordPress functionality when present.' ) . '</p>';
-?>
-
</del><span class="cx"> <?php $wp_list_table->display(); ?>
</span><span class="cx"> </form>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>