Merge remote-tracking branch 'smcv/ready/trail'

diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 2805f60efdb6d415a19aeb17195df8ff2543487b..808d3cd2bd730c3847a876e016df9145c4bb32a9 100644 (file)
--- 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 948fdcc8445c48734dd6adaeb0050c46dbd7ce5b..edd0f2cc13cb2bda681f33cf9adddc52053781ab 100644 (file)
--- 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 <joeyh@debian.org>  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 e4bc736e3c3b73a71a6a0288f4049cf92b36d8cb..0b9ed08beda515d2cd14271cf2dbe038c9c6c443 100644 (file)
--- 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 6f1fef91e5730af6cfb9eeab59c8ba23a9e85a00..783080f5c0ad88680c9bcd416b942724c771fd3d 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,3 +1,5 @@
 ## HELP
 
 $2 + 2 = 4$
+
+blah blah