Changeset 31696 for trunk/src/wp-admin/includes/screen.php

Timestamp:

03/10/2015 03:31:54 PM (12 years ago)

Author:

ocean90

Message:

Screen Options: Improve items per page option label.

Previously the label just said "Posts", "Pages", or "Comments". This was bad in terms of accessibility and internationalization because of missing context.
This change adds a default label "Number of items per page:" to WP_Screen->render_per_page_options() and removes all the existing one-word labels.

props afercia.
fixes #31349, #15576.

File:

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

trunk/src/wp-admin/includes/screen.php

@@ -1128 +1128 @@
          */
         public function render_per_page_options() {
-                if ( ! $this->get_option( 'per_page' ) )
+                if ( null === $this->get_option( 'per_page' ) ) {
                         return;
+                }
 
                 $per_page_label = $this->get_option( 'per_page', 'label' );
+                if ( null === $per_page_label ) {
+                        $per_page_label = __( 'Number of items per page:' );
+                }
 
                 $option = $this->get_option( 'per_page', 'option' );
-                if ( ! $option )
+                if ( ! $option ) {
                         $option = str_replace( '-', '_', "{$this->id}_per_page" );
+                }
 
                 $per_page = (int) get_user_option( $option );
                 if ( empty( $per_page ) || $per_page < 1 ) {
                         $per_page = $this->get_option( 'per_page', 'default' );
-                        if ( ! $per_page )
+                        if ( ! $per_page ) {
                                 $per_page = 20;
+                        }
                 }
 
@@ -1166 +1172 @@
                 <div class="screen-options">
                         <?php if ( $per_page_label ) : ?>
+                                <label for="<?php echo esc_attr( $option ); ?>"><?php echo $per_page_label; ?></label>
                                 <input type="number" step="1" min="1" max="999" class="screen-per-page" name="wp_screen_options[value]"
                                         id="<?php echo esc_attr( $option ); ?>" maxlength="3"
                                         value="<?php echo esc_attr( $per_page ); ?>" />
-                                <label for="<?php echo esc_attr( $option ); ?>">
-                                        <?php echo esc_html( $per_page_label ); ?>
-                                </label>
                         <?php endif;
 
                         echo get_submit_button( __( 'Apply' ), 'button', 'screen-options-apply', false ); ?>
-                        <input type='hidden' name='wp_screen_options[option]' value='<?php echo esc_attr($option); ?>' />
+                        <input type="hidden" name="wp_screen_options[option]" value="<?php echo esc_attr( $option ); ?>" />
                 </div>
                 <?php