X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2fe003dac47259aabfc7603ce60ead5a4030c80c..a6e69822f68864512d49a954a4581511246f0e0b:/IkiWiki/Render.pm diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index bdebaa645..e8ed627a4 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -111,7 +111,7 @@ sub genpage ($$) { } templateactions($template, $page); - my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page); + my @backlinks=sort { $a->{page} cmp $b->{page} || $a->{url} cmp $b->{url} } backlinks($page); my ($backlinks, $more_backlinks); if (@backlinks <= $config{numbacklinks} || ! $config{numbacklinks}) { $backlinks=\@backlinks; @@ -326,6 +326,7 @@ sub find_src_files (;$$$) { $page = pagename($file); if (! exists $pagesources{$page} && file_pruned($file)) { + no warnings 'once'; $File::Find::prune=1; return; } @@ -349,7 +350,7 @@ sub find_src_files (;$$$) { else { push @files, $f; if ($pages{$page}) { - debug(sprintf(gettext("%s has multiple possible source pages"), $page)); + debug(sprintf(gettext("%s has multiple possible source files; one will be chosen at random"), $page)); } $pages{$page}=1; } @@ -398,7 +399,7 @@ sub process_changed_files ($$) { } push @files, $f; if ($pages{$page}) { - debug(sprintf(gettext("%s has multiple possible source pages"), $page)); + debug(sprintf(gettext("%s has multiple possible source files; one will be chosen at random"), $page)); } $pages{$page}=1; }