urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '6e962a2d747bd8a8bbbdfc5b8eaeb689100c0b1c'

master
Joey Hess 2013-01-02 15:29:50 -04:00
parent bd40b1e635 6e962a2d74
commit c61af5c608
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/opendiscussion.pm
View File

@ -25,7 +25,7 @@ sub canedit ($$) {
my $cgi=shift; my $cgi=shift;
my $session=shift; my $session=shift;
return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i; return "" if $config{discussion} && $page=~/(\/|^)\Q$config{discussionpage}\E$/i;
return "" if pagespec_match($page, "postcomment(*)"); return "" if pagespec_match($page, "postcomment(*)");
return undef; return undef;
} }

2
doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn
View File

@ -4,3 +4,5 @@ the `discussionpage` setting to be edited anonymously, even if
(If it respected the `discussion` option, the combination of (If it respected the `discussion` option, the combination of
`opendiscussion` and `moderatedcomments` might be good for blogs.) `opendiscussion` and `moderatedcomments` might be good for blogs.)
[[done]] --[[smcv]]