Index: /trunk/bb-admin/tag-merge.php
===================================================================
--- /trunk/bb-admin/tag-merge.php	(revision 128)
+++ /trunk/bb-admin/tag-merge.php	(revision 129)
@@ -9,5 +9,5 @@
 $old_id = (int) $_POST['id' ];
 $tag = $_POST['tag'];
-if ( ! $new_tag = get_tag_by_name( $tag ) )
+if ( ! $tag = get_tag_by_name( $tag ) )
 	die('Tag specified not found.');
 
@@ -15,9 +15,9 @@
 	die('Tag to be merged not found.');
 
-if ( $merged = merge_tags( $old_id, $new_tag->tag_id ) ) {
+if ( $merged = merge_tags( $old_id, $tag->tag_id ) ) {
 	echo 'Number of topics from which the old tag was removed: ' . $merged['old_count'] . "<br />\n";
 	echo 'Number of topics to which the new tag was added: ' . $merged['diff_count'] . "<br />\n";
 	echo 'Number of rows deleted from tags table: ' . $merged['destroyed']['tags'] ."<br />\n";
-	echo '<a href="' . $bb->tagpath . "tags/$new_tag->raw_tag" . '">New Tag</a>';
+	echo '<a href="' . get_tag_link() . '">New Tag</a>';
 } else {
 	die("Something odd happened when attempting to merge those tags.<br />\n<a href=\"" . $_SERVER['HTTP_REFERER'] . '">Try Again?</a>');
Index: /trunk/bb-admin/tag-rename.php
===================================================================
--- /trunk/bb-admin/tag-rename.php	(revision 128)
+++ /trunk/bb-admin/tag-rename.php	(revision 129)
@@ -15,5 +15,5 @@
 
 if ( $tag = rename_tag( $tag_id, $tag ) )
-	header('Location: ' . $bb->tagpath . "tags/$tag" );
+	header('Location: ' . get_tag_link() );
 else
 	die('There already exists a tag by that name or the name is invalid.  <a href="' . $_SERVER['HTTP_REFERER'] . '">Try Again</a>');
Index: /trunk/bb-includes/functions.php
===================================================================
--- /trunk/bb-includes/functions.php	(revision 128)
+++ /trunk/bb-includes/functions.php	(revision 129)
@@ -684,5 +684,5 @@
 
 	if ( $bbdb->query("UPDATE $bbdb->tags SET tag = '$tag', raw_tag = '$raw_tag' WHERE tag_id = '$tag_id'") )
-		return $tag;
+		return get_tag_by_name( $tag );
 	return false;
 }