Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / IkiWiki / Plugin / opendiscussion.pm

diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index fd5c9673d68c3581722dbe41502d0363d502a5ac..96a74aee832d31af0fd653a851f95b2044a56ded 100644 (file)
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -6,16 +6,25 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
+       hook(type => "getsetup", id => "opendiscussion", call => \&getsetup);
        hook(type => "canedit", id => "opendiscussion", call => \&canedit);
 } # }}}
 
+sub getsetup () { #{{{
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },
+} #}}}
+
 sub canedit ($$) { #{{{
        my $page=shift;
        my $cgi=shift;
        my $session=shift;
 
        my $discussion=gettext("discussion");
-       return "" if $page=~/\/\Q$discussion\E$/;
+       return "" if $page=~/(\/|^)\Q$discussion\E$/;
        return undef;
 } #}}}