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

Don't use missing $taxonomy in screen_options(). $tax->name has the taxonomy slug/name we need 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nbachiyski 2010-04-20 15:13:27 +00:00
parent 049af4a425
commit 4f9e5d644b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/template.php
View File

@ -3776,10 +3776,10 @@ function screen_options($screen) {
$option = str_replace( '-', '_', "{$screen->id}_per_page" );
if ( 'edit_tags_per_page' == $option ) {
if ( 'category' == $taxonomy )
if ( 'category' == $tax->name )
$option = 'categories_per_page';
elseif ( 'post_tag' != $taxonomy )
$option = 'edit_' . $taxonomy . '_per_page';
elseif ( 'post_tag' != $tax->name )
$option = 'edit_' . $tax->name . '_per_page';
}
$per_page = (int) get_user_option( $option );