From: Joey Hess Date: Wed, 2 Jan 2013 19:31:10 +0000 (-0400) Subject: Merge remote-tracking branch 'smcv/ready/trail' X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/22cb87c6849dd2baf0c944f1d546f4318e67b325?hp=7029f98bc735efcec08213d51bdec2c6645d682d Merge remote-tracking branch 'smcv/ready/trail' --- 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/debian/changelog b/debian/changelog index 948fdcc84..edd0f2cc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.20121213) UNRELEASED; urgency=low * aggregate: When run with --aggregate, if an aggregation is already running, don't go on and --refresh. * trail: Converted all dependencies to presence dependencies. + * opendiscussion: Don't allow editing discussion pages if discussion pages + are disabled. (smcv) -- Joey Hess Sat, 22 Dec 2012 16:15:24 -0400 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]] diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 6f1fef91e..783080f5c 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,3 +1,5 @@ ## HELP $2 + 2 = 4$ + +blah blah