From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 23 Nov 2008 17:07:58 +0000 (+0000)
Subject: comments: use global configuration for allow_directives, commit, and pagename
X-Git-Tag: 2.71~117
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a9b0b3da5f002e38141c038e2ab3525b099d684b;p=ikiwiki.git

comments: use global configuration for allow_directives, commit, and pagename
---

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 892b4af26..80469f503 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -220,10 +220,9 @@ sub sessioncgi ($$) { #{{{
 		error(gettext("bad page name"));
 	}
 
-	my $allow_directives = $pagestate{$page}{comments}{allowdirectives};
-	my $commit_comments = defined $pagestate{$page}{comments}{commit}
-		? $pagestate{$page}{comments}{commit}
-		: 1;
+	my $allow_directives = $config{comments_allowdirectives};
+	my $commit_comments = $config{comments_commit};
+	my $comments_pagename = $config{comments_pagename};
 
 	# FIXME: is this right? Or should we be using the candidate subpage
 	# (whatever that might mean) as the base URL?