Merge commit 'smcv/comments'
commit
3572f5ea1a
|
@ -604,6 +604,12 @@ sub pagetemplate (@) {
|
|||
}
|
||||
}
|
||||
|
||||
# everything below this point is only relevant to the comments
|
||||
# themselves
|
||||
if (!exists $commentstate{$page}) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ($template->query(name => 'commentuser')) {
|
||||
$template->param(commentuser =>
|
||||
$commentstate{$page}{commentuser});
|
||||
|
@ -628,6 +634,14 @@ sub pagetemplate (@) {
|
|||
$template->param(commentauthorurl =>
|
||||
$commentstate{$page}{commentauthorurl});
|
||||
}
|
||||
|
||||
if ($template->query(name => 'removeurl') &&
|
||||
IkiWiki::Plugin::remove->can("check_canremove") &&
|
||||
length $config{cgiurl}) {
|
||||
$template->param(removeurl => IkiWiki::cgiurl(do => 'remove',
|
||||
page => $page));
|
||||
$template->param(have_actions => 1);
|
||||
}
|
||||
}
|
||||
|
||||
package IkiWiki::PageSpec;
|
||||
|
|
|
@ -39,4 +39,15 @@ Comment by
|
|||
|
||||
— <TMPL_VAR CTIME>
|
||||
</div>
|
||||
|
||||
<TMPL_IF NAME="HAVE_ACTIONS">
|
||||
<div class="actions">
|
||||
<ul>
|
||||
<TMPL_IF NAME="REMOVEURL">
|
||||
<li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
|
||||
</TMPL_IF>
|
||||
</ul>
|
||||
</div><!--.actions-->
|
||||
</TMPL_IF>
|
||||
|
||||
</div><!--.comment-->
|
||||
|
|
Loading…
Reference in New Issue