From 7dd074e2e712c67c8c1a26841a69281fa9d293cb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 2 Jan 2010 15:42:20 -0500
Subject: Fix several places that did not properly handle capitalization of the
 discussionpage setting.

Specifically, fixes discussion actions on discussion pages, and unbreaks the opendiscussion plugin.
---
 IkiWiki/Plugin/inline.pm         | 4 ++--
 IkiWiki/Plugin/opendiscussion.pm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 17d1611db..ec99300b3 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -357,9 +357,9 @@ sub preprocess_inline (@) {
 					my $file = $pagesources{$page};
 					my $type = pagetype($file);
 					if ($config{discussion}) {
-						if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+						if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
 						    (length $config{cgiurl} ||
-						     exists $pagesources{$page."/".$config{discussionpage}})) {
+						     exists $pagesources{$page."/".lc($config{discussionpage})})) {
 							$template->param(have_actions => 1);
 							$template->param(discussionlink =>
 								htmllink($page,
diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 1bec4b013..4517ff88b 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -23,7 +23,7 @@ sub canedit ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
-	return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/;
+	return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i;
 	return undef;
 }
 
-- 
cgit v1.2.3