X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=IkiWiki.pm;h=c078a005515c1a3dd7cfd49e8553956b3348da2b;hb=f7cda84a3724d883e469af23d63a8f3b56d31f39;hp=ad4d26741af22a5a0f087917ebc8334e819f7398;hpb=264a82a435b9ce5560f4bbea7b53270c53ef5720;p=ikiwiki.git

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ad4d26741..c078a0055 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -407,6 +407,7 @@ sub bestlink ($$) { #{{{
 		# absolute links
 		$cwd="";
 	}
+	$link=~s/\/$//;
 
 	do {
 		my $l=$cwd;
@@ -513,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;
@@ -542,6 +545,8 @@ sub htmllink ($$$;@) { #{{{
 	my $link=shift;
 	my %opts=@_;
 
+	$link=~s/\/$//;
+
 	my $bestlink;
 	if (! $opts{forcesubpage}) {
 		$bestlink=bestlink($lpage, $link);
@@ -559,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);