ensure opendiscussion hook is always called before lockedit

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

diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 3da01efee154988d1432d0ed54680525569e224c..4b91f5d8314e440920672759d0bc7c2cc394fda0 100644 (file)
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -7,7 +7,8 @@ use IkiWiki 3.00;
 
 sub import {
        hook(type => "getsetup", id => "opendiscussion", call => \&getsetup);
-       hook(type => "canedit", id => "opendiscussion", call => \&canedit);
+       hook(type => "canedit", id => "opendiscussion", call => \&canedit,
+               first => 1);
 }
 
 sub getsetup () {
@@ -23,8 +24,7 @@ sub canedit ($$) {
        my $cgi=shift;
        my $session=shift;
 
-       my $discussion=gettext("discussion");
-       return "" if $page=~/(\/|^)\Q$discussion\E$/;
+       return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i;
        return undef;
 }