fix events_of_pages(): sort @hour_events
authorJulien Moutinho <julm+ikiwiki+events@autogeree.net>
Tue, 8 Apr 2014 00:16:54 +0000 (02:16 +0200)
committerJulien Moutinho <julm+ikiwiki+events@autogeree.net>
Tue, 8 Apr 2014 00:16:54 +0000 (02:16 +0200)
events.pm

index 2999b1e..6e0d1da 100644 (file)
--- a/events.pm
+++ b/events.pm
@@ -250,7 +250,11 @@ sub events_of_pages ($%) {
        return
         map {event_of_page($_->{page}, $_->{date}, %params)}
         ( (sort {lc IkiWiki::basename($a->{page}) cmp lc IkiWiki::basename($b->{page})} @day_events)
-        , (sort {lc $a->{date}->{hour}.'/'.IkiWiki::basename($a->{page}) cmp lc $b->{date}->{hour}.'/'.IkiWiki::basename($b->{page})} @hour_events) );
+        , (sort {
+               my $r = $a->{date}->{hour} cmp $b->{date}->{hour};
+               if ($r) { $r }
+               else { IkiWiki::basename($a->{page}) cmp IkiWiki::basename($b->{page}) }
+        } @hour_events) );
  }
 sub event_html ($$%) {
        my ($date, $format, %params) = @_;