Index: /trunk/b2-include/b2template.functions.php
===================================================================
--- /trunk/b2-include/b2template.functions.php	(revision 594)
+++ /trunk/b2-include/b2template.functions.php	(revision 595)
@@ -1497,5 +1497,10 @@
 function comment_author() {
 	global $comment;
-	echo stripslashes($comment->comment_author);
+	if (!empty($comment->comment_author)) {
+		echo htmlspecialchars(stripslashes($comment->comment_author));
+	}
+	else {
+		echo "Anonymous";
+	}
 }
 
@@ -1509,5 +1514,8 @@
 	$url = trim(stripslashes($comment->comment_author_url));
 	$email = stripslashes($comment->comment_author_email);
-	$author = stripslashes($comment->comment_author);
+	$author = htmlspecialchars(stripslashes($comment->comment_author));
+	if (empty($author)) {
+		$author = "Anonymous";
+	}
 
 	$url = str_replace('http://url', '', $url);
@@ -1620,5 +1628,10 @@
 function comment_author_rss() {
 	global $comment;
-	echo strip_tags(stripslashes($comment->comment_author));
+	if (!empty($comment->comment_author)) {
+		echo htmlspecialchars(strip_tags(stripslashes($comment->comment_author)));
+	}
+	else {
+		echo "Anonymous";
+	}
 }