X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=events.pm;h=6e0d1da3cfea7c00a8027c01148da9205aa32f8e;hb=51377e1af6dd2c06c5e353b2804e7732926ecf9f;hp=51c176d419a836b730209261a8fb3b364fe42fa0;hpb=e518be4f1f73ddc3b2443f0a6e9f21b8524a21f9;p=ikiwiki%2Fevents.git

diff --git a/events.pm b/events.pm
index 51c176d..6e0d1da 100644
--- 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->{hour}.'/'.IkiWiki::basename($a->{page}) cmp lc $b->{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) = @_;