From d00e8d78c806b4f94b2ab7bf70e2ffb9a56781cd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 17 Nov 2007 19:58:17 -0500
Subject: * Don't consider links to anchors on the same page to be self links. 
  Patch by Daniel Burrows. Closes: #451729 * When usedirs is disabled, link
 direct to index.html files, not to   directories, to improve browsing of
 file:// urls.   Patch by Daniel Burrows. Closes: #451728

---
 IkiWiki.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to '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);
-- 
cgit v1.2.3