Index: template-functions-general.php
===================================================================
--- template-functions-general.php	(revision 2699)
+++ template-functions-general.php	(working copy)
@@ -240,13 +240,15 @@
     $title_text = wp_specialchars($text, 1);
 
 	if ('link' == $format) {
-		return "\t<link rel='archives' title='$title_text' href='$url' />\n";
+		return "\t<link rel=\"archives\" title=\"$title_text\" href=\"$url\" />\n";
+	} elseif ('htmllink' == $format) {
+		return "\t<link rel=\"archives\" title=\"$title_text\" href=\"$url\" >\n";
 	} elseif ('option' == $format) {
-		return "\t<option value='$url'>$before $text $after</option>\n";
+		return "\t<option value=\"$url\">$before $text $after</option>\n";
 	} elseif ('html' == $format) {
-		return "\t<li>$before<a href='$url' title='$title_text'>$text</a>$after</li>\n";
+		return "\t<li>$before<a href=\"$url\" title=\"$title_text\">$text</a>$after</li>\n";
 	} else { // custom
-		return "\t$before<a href='$url' title='$title_text'>$text</a>$after\n";
+		return "\t$before<a href=\"$url\" title=\"$title_text\">$text</a>$after\n";
 	}
 }