From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 25 Jan 2009 23:56:47 +0000 (-0500)
Subject: clean up comment preview
X-Git-Tag: 3.03~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a5085e5126d1f76d28a4438b1527659183477b5;p=ikiwiki.git

clean up comment preview

Remove actions from it, and avoid a broken title link.
---

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 388a983f7..ad5395a82 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -673,6 +673,8 @@ sub previewcomment ($$$) {
 			template => $template);
 	});
 
+	$template->param(have_actions => 0);
+
 	return $template->output;
 }
 
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 582efccb8..b4f235845 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,6 +1,12 @@
 <div class="comment" id="<TMPL_VAR NAME=INLINEPAGE>">
 
-<div class="comment-subject"><a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a></div>
+<div class="comment-subject">
+<TMPL_IF PERMALINK">
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
+<TMPL_VAR TITLE>
+</TMPL_IF>
+</div>
 
 <div class="inlinecontent">
 <TMPL_VAR CONTENT>