diff options
| author | Joey Hess <joey@kitenet.net> | 2013-01-02 15:29:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-02 15:29:50 -0400 |
| commit | c61af5c60829d49abbf1184eed94558f9c144563 (patch) | |
| tree | aef4d70a3922b75763d828c4fb9e58f2e20bb9d9 | |
| parent | bd40b1e63598bb8a4fbf01818cc8ca498aa27ac9 (diff) | |
| parent | 6e962a2d747bd8a8bbbdfc5b8eaeb689100c0b1c (diff) | |
| download | ikiwiki-c61af5c60829d49abbf1184eed94558f9c144563.tar ikiwiki-c61af5c60829d49abbf1184eed94558f9c144563.tar.gz | |
Merge commit '6e962a2d747bd8a8bbbdfc5b8eaeb689100c0b1c'
| -rw-r--r-- | IkiWiki/Plugin/opendiscussion.pm | 2 | ||||
| -rw-r--r-- | doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm index 2805f60ef..808d3cd2b 100644 --- a/IkiWiki/Plugin/opendiscussion.pm +++ b/IkiWiki/Plugin/opendiscussion.pm @@ -25,7 +25,7 @@ sub canedit ($$) { my $cgi=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 undef; } diff --git a/doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn b/doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn index e4bc736e3..0b9ed08be 100644 --- a/doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn +++ b/doc/bugs/opendiscussion_should_respect_the_discussion_option.mdwn @@ -4,3 +4,5 @@ the `discussionpage` setting to be edited anonymously, even if (If it respected the `discussion` option, the combination of `opendiscussion` and `moderatedcomments` might be good for blogs.) + +[[done]] --[[smcv]] |