X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/96dab37a8e3acc58fb0ab5be0657c0e545e9684a..1dc7aa1a3e3697c5ebbd88e6ef3527789ca7b2ef:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 90058199c..bc997ffb0 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -63,12 +63,13 @@ sub genpage ($$) { #{{{
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
-		$template->param(editurl => cgiurl(do => "edit", page => $page));
+		$template->param(editurl => cgiurl(do => "edit", page => $page))
+			if IkiWiki->can("cgi_editpage");
 		$template->param(prefsurl => cgiurl(do => "prefs"));
 		$actions++;
 	}
 		
-	if (length $config{historyurl}) {
+	if (defined $config{historyurl} && length $config{historyurl}) {
 		my $u=$config{historyurl};
 		$u=~s/\[\[file\]\]/$pagesources{$page}/g;
 		$template->param(historyurl => $u);
@@ -249,7 +250,7 @@ sub refresh () { #{{{
 	my $test=$config{srcdir};
 	while (length $test) {
 		if (-l $test && ! $config{allow_symlinks_before_srcdir}) {
-			error("symlink found in srcdir path ($test) -- set allow_symlinks_before_srcdir to allow this");
+			error(sprintf(gettext("symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this")), $test);
 		}
 		unless ($test=~s/\/+$//) {
 			$test=dirname($test);
@@ -278,7 +279,11 @@ sub refresh () { #{{{
 				else {
 					$f=~s/^\Q$config{srcdir}\E\/?//;
 					push @files, $f;
-					$exists{pagename($f)}=1;
+					my $pagename = pagename($f);
+					if ($exists{$pagename}) {
+						debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
+					}
+					$exists{$pagename}=1;
 				}
 			}
 		},