diff options
author | intrigeri <intrigeri@boum.org> | 2010-07-11 10:46:18 +0200 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2010-07-11 10:46:18 +0200 |
commit | c99d26030e6ddd7a21932e98e40a8df7d896886d (patch) | |
tree | 26056e3e2a5c7c81ebe7baf243a0bb4ae765e76e /templates | |
parent | c9b1a4dd7d826b5e8e2d0a757ba5ecbba8d832b2 (diff) | |
parent | 1bb9157f2ab94b8306e1e2fb1a5b3ac9bbfe5772 (diff) |
Merge remote branch 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn
Diffstat (limited to 'templates')
-rw-r--r-- | templates/comment.tmpl | 5 |
1 files changed, 4 insertions, 1 deletions
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> — <TMPL_VAR CTIME> |