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

diff --git a/events.pm b/events.pm
index 2999b1e..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->{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) = @_;