From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sun, 21 Dec 2008 15:23:59 +0000 (+0000)
Subject: beautify_urlpath: add ./ before checking for /index.html
X-Git-Tag: 2.71~10^2~5
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=0844bd0b1567404243d95e616d3c7526e922822d

beautify_urlpath: add ./ before checking for /index.html

This fixes a bug: when a page links to its own #comments anchor you would
get a link like "index.html#comments" rather than "./#comments".
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 47116089b..97c835cf6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -949,16 +949,16 @@ sub formattime ($;$) {
 sub beautify_urlpath ($) {
 	my $url=shift;
 
-	if ($config{usedirs}) {
-		$url =~ s!/index.$config{htmlext}$!/!;
-	}
-
 	# Ensure url is not an empty link, and if necessary,
 	# add ./ to avoid colon confusion.
 	if ($url !~ /^\// && $url !~ /^\.\.\//) {
 		$url="./$url";
 	}
 
+	if ($config{usedirs}) {
+		$url =~ s!/index.$config{htmlext}$!/!;
+	}
+
 	return $url;
 }