(no commit message)

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index bdebaa64583501c87291877766dda5edddbab52a..e8ed627a40237021dd9ae38ff730077b8231c8f2 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -111,7 +111,7 @@ sub genpage ($$) {
        }
        templateactions($template, $page);
 
        }
        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;
        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)) {
                $page = pagename($file);
                if (! exists $pagesources{$page} &&
                    file_pruned($file)) {

+                       no warnings 'once';

                        $File::Find::prune=1;
                        return;
                }
                        $File::Find::prune=1;
                        return;
                }


@@ -349,7 +350,7 @@ sub find_src_files (;$$$) {
                else {
                        push @files, $f;
                        if ($pages{$page}) {
                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;
                }
                        }
                        $pages{$page}=1;
                }


@@ -398,7 +399,7 @@ sub process_changed_files ($$) {
                }
                push @files, $f;
                if ($pages{$page}) {
                }
                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;
        }
                }
                $pages{$page}=1;
        }