Ticket #18958: 18958.3.diff

wp-admin/includes/misc.php

@@ -328 +328 @@
                 if ( !preg_match( '/^[a-z_-]+$/', $option ) )
                         return;
 
-                $option = str_replace('-', '_', $option);
-
                 $map_option = $option;
                 $type = str_replace('edit_', '', $map_option);
                 $type = str_replace('_per_page', '', $type);
@@ -337 +335 @@
                         $map_option = 'edit_per_page';
                 if ( in_array( $type, get_taxonomies()) )
                         $map_option = 'edit_tags_per_page';
+                else
+                        $option = str_replace('-', '_', $option);
 
                 switch ( $map_option ) {
                         case 'edit_per_page':

wp-admin/edit-tags.php

@@ -36 +36 @@
         $submenu_file = "edit-tags.php?taxonomy=$taxonomy";
 }
 
-add_screen_option( 'per_page', array('label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page') );
+add_screen_option( 'per_page', array( 'label' => $title, 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) );
 
 switch ( $wp_list_table->current_action() ) {
 

wp-admin/edit.php

@@ -215 +215 @@
         );
 }
 
-add_screen_option( 'per_page', array('label' => $title, 'default' => 20) );
+add_screen_option( 'per_page', array( 'label' => $title, 'default' => 20, 'option' => 'edit_' . $post_type . '_per_page' ) );
 
 require_once('./admin-header.php');
 ?>