diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2007-11-17 19:58:17 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2007-11-17 19:58:17 -0500 |
| commit | d00e8d78c806b4f94b2ab7bf70e2ffb9a56781cd (patch) | |
| tree | 23a61e93adb01e936ff5b12f50dba9203e08d908 | |
| parent | 9dd52850252fc3ad5961277db586cb29eb5d42bd (diff) | |
* 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
| -rw-r--r-- | IkiWiki.pm | 7 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 11 insertions, 3 deletions
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); diff --git a/debian/changelog b/debian/changelog index 365b9148e..ccfa808fe 100644 --- 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 |