From 4f9e5d644be3e264f5fe98caf5dc35ceff2fde40 Mon Sep 17 00:00:00 2001
From: nbachiyski <nbachiyski@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 20 Apr 2010 15:13:27 +0000
Subject: [PATCH] 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
---
 wp-admin/includes/template.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 3bc93ba01c..491ceffb8e 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -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 );