Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index fd5c9673d68c3581722dbe41502d0363d502a5ac..808d3cd2bd730c3847a876e016df9145c4bb32a9 100644 (file)
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -3,20 +3,31 @@ package IkiWiki::Plugin::opendiscussion;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
-       hook(type => "canedit", id => "opendiscussion", call => \&canedit);
-} # }}}
+sub import {
+       hook(type => "getsetup", id => "opendiscussion", call => \&getsetup);
+       hook(type => "canedit", id => "opendiscussion", call => \&canedit,
+               first => 1);
+}

 
 

-sub canedit ($$) { #{{{
+sub getsetup () {
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+                       section => "auth",
+               },
+}
+
+sub canedit ($$) {

        my $page=shift;
        my $cgi=shift;
        my $session=shift;
 
        my $page=shift;
        my $cgi=shift;
        my $session=shift;
 

-       my $discussion=gettext("discussion");
-       return "" if $page=~/\/\Q$discussion\E$/;
+       return "" if $config{discussion} && $page=~/(\/|^)\Q$config{discussionpage}\E$/i;
+       return "" if pagespec_match($page, "postcomment(*)");

        return undef;
        return undef;

-} #}}}
+}

 
 1
 
 1