Changeset 17807

Timestamp:

05/05/2011 05:54:19 AM (13 years ago)

Author:

dd32

Message:

• Allow Pagination for Must-Use/Dropin plugins
• Move help text into WP_Plugins_List_Table

Fixes #17327 for 3.1

Location:

branches/3.1/wp-admin

Files:

• includes/class-wp-plugins-list-table.php (modified) (2 diffs)
• plugins.php (modified) (1 diff)

branches/3.1/wp-admin/includes/class-wp-plugins-list-table.php

@@ -196 +196 @@
     }
 
-    function display_tablenav( $which ) {
-        global $status;
-
-        if ( !in_array( $status, array( 'mustuse', 'dropins' ) ) )
-            parent::display_tablenav( $which );
-    }
-
     function get_views() {
         global $totals, $status;
@@ -287 +280 @@
         global $status;
 
-        if ( 'recently_activated' == $status ) { ?>
-            <div class="alignleft actions">
-                <?php submit_button( __( 'Clear List' ), 'secondary', 'clear-recent-list', false ); ?>
-            </div>
-        <?php }
+        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>' . __( 'Files in the <code>/wp-content/mu-plugins</code> directory are executed automatically.' ) . '</p>';
+        elseif ( 'top' == $which && 'dropins' == $status )
+            echo '<p>' . __( 'Drop-ins are advanced plugins in the <code>/wp-content</code> directory that replace WordPress functionality when present.' ) . '</p>';
+
+        echo '</div>';
     }
 

branches/3.1/wp-admin/plugins.php

@@ -408 +408 @@
 <input type="hidden" name="paged" value="<?php echo esc_attr($page) ?>" />
 
-<?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>';
-?>
-
 <?php $wp_list_table->display(); ?>
 </form>