X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5a82103526ab32e018cd999bb6a53d9e097c83a8..21c3f606b82ffca8c1b8fed2010f3e6167953a35:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5b951df83..863964207 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -93,7 +93,7 @@ sub genpage ($$$) { #{{{
 		$template->param(historyurl => $u);
 		$actions++;
 	}
-	if ($config{discussion}) {
+	if ($config{discussion} && (length $config{cgiurl} || exists $links{"$page/discussion"})) {
 		$template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
 		$actions++;
 	}
@@ -155,8 +155,8 @@ sub scan ($) { #{{{
 			push @links, titlepage($2);
 		}
 		if ($config{discussion}) {
-			# Discussion links are a special case since they're not in the
-			# text of the page, but on its template.
+			# Discussion links are a special case since they're
+			# not in the text of the page, but on its template.
 			push @links, "$page/discussion";
 		}
 		$links{$page}=\@links;
@@ -213,11 +213,12 @@ sub refresh () { #{{{
 	my %exists;
 	my @files;
 	eval q{use File::Find};
+	error($@) if $@;
 	find({
 		no_chdir => 1,
 		wanted => sub {
 			$_=decode_utf8($_);
-			if (/$config{wiki_file_prune_regexp}/) {
+			if (file_pruned($_, $config{srcdir})) {
 				$File::Find::prune=1;
 			}
 			elsif (! -d $_ && ! -l $_) {
@@ -237,7 +238,7 @@ sub refresh () { #{{{
 		no_chdir => 1,
 		wanted => sub {
 			$_=decode_utf8($_);
-			if (/$config{wiki_file_prune_regexp}/) {
+			if (file_pruned($_, $config{underlaydir})) {
 				$File::Find::prune=1;
 			}
 			elsif (! -d $_ && ! -l $_) {