WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only show 'Show on screen' once in screen options. fixes #17431. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19943 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-02-17 23:19:52 +00:00
parent a40a97dbc9
commit bc73871a55
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/includes/screen.php
View File

@ -793,9 +793,12 @@ final class WP_Screen {
?> ?>
<div id="screen-options-wrap" class="hidden"> <div id="screen-options-wrap" class="hidden">
<form id="adv-settings" action="" method="post"> <form id="adv-settings" action="" method="post">
<?php if ( isset( $wp_meta_boxes[ $this->id ] ) || $this->get_option( 'per_page' ) || ( $columns && empty( $columns['_title'] ) ) ) : ?>
<h5><?php _e( 'Show on screen' ); ?></h5>
<?php <?php
endif;
if ( isset( $wp_meta_boxes[ $this->id ] ) ) : ?> if ( isset( $wp_meta_boxes[ $this->id ] ) ) : ?>
<h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
<div class="metabox-prefs"> <div class="metabox-prefs">
<?php <?php
meta_box_prefs( $this ); meta_box_prefs( $this );
@ -817,8 +820,10 @@ final class WP_Screen {
<br class="clear" /> <br class="clear" />
</div> </div>
<?php endif; <?php endif;
if ( ! empty( $columns ) ) : ?> if ( $columns ) :
<h5><?php echo ( isset( $columns['_title'] ) ? $columns['_title'] : _x('Show on screen', 'Columns') ) ?></h5> if ( ! empty( $columns['_title'] ) ) : ?>
<h5><?php echo $columns['_title']; ?></h5>
<?php endif; ?>
<div class="metabox-prefs"> <div class="metabox-prefs">
<?php <?php
$special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname'); $special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username', 'blogname');
@ -933,7 +938,6 @@ final class WP_Screen {
$per_page = apply_filters( 'edit_posts_per_page', $per_page, $this->post_type ); $per_page = apply_filters( 'edit_posts_per_page', $per_page, $this->post_type );
?> ?>
<h5><?php _ex('Show on screen', 'Screen Options') ?></h5>
<div class='screen-options'> <div class='screen-options'>
<?php if ( !empty($per_page_label) ): ?> <?php if ( !empty($per_page_label) ): ?>
<input type='text' class='screen-per-page' name='wp_screen_options[value]' <input type='text' class='screen-per-page' name='wp_screen_options[value]'