Changeset 21322 for trunk/wp-admin/includes/misc.php

Timestamp:

07/25/2012 04:13:13 PM (11 years ago)

Author:

ryan

Message:

Fix per_page screen option for custom post types and taxonomies. Don't convert taxonomy and post type slugs from hyphen to underscore when saving the per_page usermeta. Props nacin. see #18958

File:

• trunk/wp-admin/includes/misc.php (modified) (1 diff)

trunk/wp-admin/includes/misc.php

@@ -329 +329 @@
             return;
 
-        $option = str_replace('-', '_', $option);
-
         $map_option = $option;
         $type = str_replace('edit_', '', $map_option);
         $type = str_replace('_per_page', '', $type);
-        if ( in_array($type, get_post_types()) )
+        if ( in_array( $type, get_taxonomies() ) )
+            $map_option = 'edit_tags_per_page';
+        elseif ( in_array( $type, get_post_types() ) )
             $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 ) {