* 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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 81a634e2b185a4c1e32ac1539e90275777405d69..c078a005515c1a3dd7cfd49e8553956b3348da2b 100644 (file)
--- 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);

diff --git a/debian/changelog b/debian/changelog
index 365b9148e2189530d93794d8358f7a19c3b2afd5..ccfa808fe8952122f46ef1691e1357efbd49ef8c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,13 @@ ikiwiki (2.13) UNRELEASED; urgency=low
   * Fix mercurial historyurl in example setup file.
   * More compact output for the brokenlinks plugin.
   * Allow trailing slashes after page names in wikilinks.
+  * 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
 
- -- Joey Hess <joeyh@debian.org>  Sat, 17 Nov 2007 16:26:14 -0500
+ -- Joey Hess <joeyh@debian.org>  Sat, 17 Nov 2007 19:56:46 -0500
 
 ikiwiki (2.12) unstable; urgency=low