Changeset 19943

Timestamp:

02/17/2012 11:19:52 PM (13 years ago)

Author:

nacin

Message:

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

File:

• trunk/wp-admin/includes/screen.php (modified) (3 diffs)

trunk/wp-admin/includes/screen.php

@@ -794 +794 @@
         <div id="screen-options-wrap" class="hidden">
         <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
+        endif;
+
         if ( isset( $wp_meta_boxes[ $this->id ] ) ) : ?>
-            <h5><?php _ex('Show on screen', 'Metaboxes') ?></h5>
             <div class="metabox-prefs">
                 <?php
@@ -818 +821 @@
             </div>
             <?php endif;
-            if ( ! empty( $columns ) ) : ?>
-            <h5><?php echo ( isset( $columns['_title'] ) ? $columns['_title'] : _x('Show on screen', 'Columns') ) ?></h5>
+            if ( $columns ) :
+                if ( ! empty( $columns['_title'] ) ) : ?>
+            <h5><?php echo $columns['_title']; ?></h5>
+            <?php endif; ?>
             <div class="metabox-prefs">
                 <?php
@@ -934 +939 @@
 
         ?>
-        <h5><?php _ex('Show on screen', 'Screen Options') ?></h5>
         <div class='screen-options'>
             <?php if ( !empty($per_page_label) ): ?>