img: stop ImageMagick trying to be clever if filenames contain a colon

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

diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 3da01efee154988d1432d0ed54680525569e224c..808d3cd2bd730c3847a876e016df9145c4bb32a9 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);
 
 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 () {
 }
 
 sub getsetup () {


@@ -15,6 +16,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
                plugin => {
                        safe => 1,
                        rebuild => 0,

+                       section => "auth",

                },
 }
 
                },
 }
 


@@ -23,8 +25,8 @@ sub canedit ($$) {
        my $cgi=shift;
        my $session=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;
 }