Index: wp-includes/category-template.php
===================================================================
--- wp-includes/category-template.php	(revision 6199)
+++ wp-includes/category-template.php	(working copy)
@@ -418,9 +418,10 @@
 // Tags
 //
 
-function get_tag_link( $tag_id ) {
+function get_tag_link( $tag_id, $taglink = '' ) {
 	global $wp_rewrite;
-	$taglink = $wp_rewrite->get_tag_permastruct();
+	if ( empty($taglink) )
+		$taglink = $wp_rewrite->get_tag_permastruct();
 
 	$tag = &get_term($tag_id, 'post_tag');
 	if ( is_wp_error( $tag ) )
@@ -458,7 +459,7 @@
 	return $tags;
 }
 
-function get_the_tag_list( $before = '', $sep = '', $after = '' ) {
+function get_the_tag_list( $before = '', $sep = '', $after = '', $link_tag = true, $taglink = '' ) {
 	$tags = get_the_tags();
 
 	if ( empty( $tags ) )
@@ -466,10 +467,14 @@
 
 	$tag_list = $before;
 	foreach ( $tags as $tag ) {
-		$link = get_tag_link($tag->term_id);
-		if ( is_wp_error( $link ) )
-			return $link;
-		$tag_links[] = '<a href="' . $link . '" rel="tag">' . $tag->name . '</a>';
+		if ( true === $link_tag ) {
+			$link = get_tag_link($tag->term_id, $taglink);
+			if ( is_wp_error( $link ) )
+				return $link;
+			$tag_links[] = '<a href="' . $link . '" rel="tag">' . $tag->name . '</a>';
+		} else {
+			$tag_links[] = $tag->name;
+		}
 	}
 
 	$tag_links = join( $sep, $tag_links );
@@ -481,8 +486,8 @@
 	return $tag_list;
 }
 
-function the_tags( $before = 'Tags: ', $sep = ', ', $after = '' ) {
-	$return = get_the_tag_list($before, $sep, $after);
+function the_tags( $before = 'Tags: ', $sep = ', ', $after = '', $link_tag = true, $taglink = '' ) {
+	$return = get_the_tag_list($before, $sep, $after, $link_tag, $taglink);
 	if ( is_wp_error( $return ) )
 		return false;
 	else