X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9dd52850252fc3ad5961277db586cb29eb5d42bd..d00e8d78c806b4f94b2ab7bf70e2ffb9a56781cd:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 81a634e2b..c078a0055 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -514,7 +514,9 @@ sub displaytime ($;$) { #{{{
 sub beautify_url ($) { #{{{
 	my $url=shift;
 
-	$url =~ s!/index.$config{htmlext}$!/!;
+	if ($config{usedirs}) {
+		$url =~ s!/index.$config{htmlext}$!/!;
+	}
 	$url =~ s!^$!./!; # Browsers don't like empty links...
 
 	return $url;
@@ -562,7 +564,8 @@ sub htmllink ($$$;@) { #{{{
 	}
 	
 	return "<span class=\"selflink\">$linktext</span>"
-		if length $bestlink && $page eq $bestlink;
+		if length $bestlink && $page eq $bestlink &&
+		   ! defined $opts{anchor};
 	
 	if (! $destsources{$bestlink}) {
 		$bestlink=htmlpage($bestlink);