web commit by http://adam.shand.net/

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 7fd7daf117cc8b597a4fdc9d01f356f2071a5a75..e77379a65e528114d49381c9d8c2e1286bc1e59e 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -31,8 +31,8 @@ sub backlinks ($) { #{{{
 
        my @links;
        foreach my $p (keys %{$backlinks{$page}}) {
-               my $href=abs2rel(htmlpage($p), dirname($page));
-                       
+               my $href=urlto($p, $page);
+                
                # Trim common dir prefixes from both pages.
                my $p_trimmed=$p;
                my $page_trimmed=$page;
@@ -46,7 +46,7 @@ sub backlinks ($) { #{{{
        }
        @links = sort { $a->{page} cmp $b->{page} } @links;
 
-       return \@links, [] if @links <= $config{numbacklinks};
+       return \@links, [] if @links <= $config{numbacklinks} || ! $config{numbacklinks};
        return [@links[0..$config{numbacklinks}-1]],
               [@links[$config{numbacklinks}..$#links]];
 } #}}}
@@ -57,18 +57,14 @@ sub parentlinks ($) { #{{{
        my @ret;
        my $pagelink="";
        my $path="";
-       my $skip=1;
+       my $title=$config{wikiname};
+       
        return if $page eq 'index'; # toplevel
-       foreach my $dir (reverse split("/", $page)) {
-               if (! $skip) {
-                       $path.="../";
-                       unshift @ret, { url => $path.htmlpage($dir), page => pagetitle($dir) };
-               }
-               else {
-                       $skip=0;
-               }
+       foreach my $dir (split("/", $page)) {
+               push @ret, { url => urlto($path, $page), page => $title };
+               $path.="/".$dir;
+               $title=pagetitle($dir);
        }
-       unshift @ret, { url => length $path ? $path : ".", page => $config{wikiname} };
        return @ret;
 } #}}}