From 0de8433dde7c2bb7b656c70a75f93cd6f2d23a2d Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Wed, 26 Mar 2008 21:54:02 +0000
Subject: [PATCH] Fix redirects after editing and deleting tags.

git-svn-id: https://develop.svn.wordpress.org/trunk@7536 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/edit-tag-form.php |  2 +-
 wp-admin/edit-tags.php     | 25 ++++++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index b268f4da89..62a8e2b8ff 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -22,7 +22,7 @@ if ( ! empty($tag_ID) ) {
 <?php echo $form ?>
 <input type="hidden" name="action" value="<?php echo $action ?>" />
 <input type="hidden" name="tag_ID" value="<?php echo $tag->term_id ?>" />
-<?php wp_nonce_field($nonce_action); ?>
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field($nonce_action); ?>
 	<table class="form-table">
 		<tr class="form-field form-required">
 			<th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th>
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index f2b3b49f48..b50269be09 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -52,7 +52,14 @@ case 'bulk-delete':
 		wp_delete_term( $tag_ID, 'post_tag');
 	}
 
-	wp_redirect('edit-tags.php?message=6');
+	$location = 'edit-tags.php';
+	if ( $referer = wp_get_referer() ) {
+		if ( false !== strpos($referer, 'edit-tags.php') )
+			$location = $referer;
+	}
+
+	$location = add_query_arg('message', 6, $location);
+	wp_redirect($location);
 	exit;
 
 break;
@@ -75,11 +82,19 @@ case 'editedtag':
 		wp_die(__('Cheatin&#8217; uh?'));
 
 	$ret = wp_update_term($tag_ID, 'post_tag', $_POST);
-	if( $ret && !is_wp_error( $ret ) ) {
-		wp_redirect('edit-tags.php?message=3');
-	} else {
-		wp_redirect('edit-tags.php?message=5');
+
+	$location = 'edit-tags.php';
+	if ( $referer = wp_get_original_referer() ) {
+		if ( false !== strpos($referer, 'edit-tags.php') )
+			$location = $referer;
 	}
+
+	if ( $ret && !is_wp_error( $ret ) )
+		$location = add_query_arg('message', 3, $location);
+	else
+		$location = add_query_arg('message', 5, $location);
+
+	wp_redirect($location);
 	exit;
 break;