diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php index 06a686aee8..de33a274d6 100644 --- a/wp-admin/includes/misc.php +++ b/wp-admin/includes/misc.php @@ -345,6 +345,7 @@ function set_screen_options() { case 'upload_per_page': case 'categories_per_page': case 'edit_tags_per_page': + case 'plugins_per_page': $value = (int) $value; if ( $value < 1 || $value > 999 ) return; diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 890b866ef5..44d11661a9 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -3351,7 +3351,14 @@ function screen_meta($screen) { if ( isset($meta_screens[$screen]) ) $screen = $meta_screens[$screen]; $show_screen = false; - if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens) ) + $show_on_screen = false; + if ( !empty($wp_meta_boxes[$screen]) || !empty($column_screens) ) { + $show_screen = true; + $show_on_screen = true; + } + + $screen_options = screen_options($screen); + if ( $screen_options ) $show_screen = true; if ( !isset($_wp_contextual_help) ) @@ -3403,6 +3410,7 @@ function screen_meta($screen) { ?> @@ -3555,6 +3564,9 @@ function screen_options($screen) { case 'edit-tags': $per_page_label = __('Tags per page:'); break; + case 'plugins': + $per_page_label = __('Plugins per page:'); + break; default: return ''; } @@ -3568,8 +3580,8 @@ function screen_options($screen) { $return .= "
\n"; if ( !empty($per_page_label) ) $return .= " \n"; - $return .= ""; - $return .= ""; + $return .= ""; + $return .= ""; $return .= "
\n"; return $return; } diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 535d647382..b4215f4241 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -206,7 +206,9 @@ if ( !empty($invalid) )
-

+

+ +