urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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
master
Joey Hess 2007-11-17 19:58:17 -05:00
parent 9dd5285025
commit d00e8d78c8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IkiWiki.pm
View File

@ -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);

7
debian/changelog vendored
View File

@ -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