Merge commit 'smcv/comments'

1 files changed, 5 insertions, 5 deletions

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 47116089b..6747a3ba4 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 !~ /^\.\.\//) {
+	if ($url !~ /^\// && $url !~ /^\.\.?\//) {
 		$url="./$url";
 	}
 
+	if ($config{usedirs}) {
+		$url =~ s!/index.$config{htmlext}$!/!;
+	}
+
 	return $url;
 }