summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--templates/comment.tmpl5
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0697efffd..4ce720ab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
* hnb: Fixed broken use of mkstemp that had caused dangling temp files,
and prevented actually rendering hnb files.
* Use comment template on comments page of example blog.
+ * comment.tmpl: Fix up display when inline uses it to display a non-comment
+ page. (Such as a discussion page.)
-- Joey Hess <joeyh@debian.org> Wed, 23 Jun 2010 15:30:04 -0400
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index fa90e6d26..c2ee5a371 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -14,8 +14,8 @@
<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
<TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF>
-Comment by
<TMPL_IF COMMENTUSER>
+Comment by
<TMPL_IF COMMENTOPENID>
<span class="author" title="OpenID">
<a href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a>
@@ -30,6 +30,8 @@ Comment by
</span>
</TMPL_IF>
<TMPL_ELSE>
+<TMPL_IF AUTHOR>
+Comment by
<TMPL_IF COMMENTIP>
<span class="author" title="Unauthenticated, from <TMPL_VAR COMMENTIP>">
<TMPL_ELSE>
@@ -40,6 +42,7 @@ Comment by
<TMPL_ELSE>
<TMPL_VAR AUTHOR>
</TMPL_IF>
+</TMPL_IF>
</span>
</TMPL_IF>
&mdash; <TMPL_VAR CTIME>