From 73432f9c5ad480ea4c8c94743026b11fdb638cbd Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 11 Nov 2011 15:44:16 +0000
Subject: [PATCH] Use taxnow to determine the taxonomy for GET and POST
 requests in edit-tags.php. Props nacin. fixes #19131

git-svn-id: http://svn.automattic.com/wordpress/trunk@19253 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-tags.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index a6442751f..f14f6330a 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -9,16 +9,10 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-if ( ! isset( $_GET['taxonomy'] ) )
-	$taxonomy = 'post_tag';
-elseif ( in_array( $_GET['taxonomy'], get_taxonomies() ) )
-	$taxonomy = sanitize_key( $_GET['taxonomy'] );
-else
+if ( ! $taxnow )
 	wp_die( __( 'Invalid taxonomy' ) );
 
-$_GET['taxonomy'] = $taxonomy;
-
-$tax = get_taxonomy( $taxonomy );
+$tax = get_taxonomy( $taxnow );
 
 if ( ! $tax )
 	wp_die( __( 'Invalid taxonomy' ) );