Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 4b1a432b21d32c3948fd7bf623a7cfe79f04dff6..96a74aee832d31af0fd653a851f95b2044a56ded 100644 (file)
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -3,19 +3,28 @@ package IkiWiki::Plugin::opendiscussion;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

+       hook(type => "getsetup", id => "opendiscussion", call => \&getsetup);

        hook(type => "canedit", id => "opendiscussion", call => \&canedit);
 } # }}}
 
        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");
 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;
 } #}}}
 
        return undef;
 } #}}}