From a4eaa35e23178e444cd83288479aad67e8f80efd Mon Sep 17 00:00:00 2001 From: Cameron Ball Date: Fri, 19 May 2017 15:08:05 +0800 Subject: [PATCH] MDL-58994 core_calendar: Coalesce event sort field There are situations where we need to sort events on a field called "timesort", but sometimes it is not set. So we can fall back to "timestart" in this case. --- calendar/classes/local/event/data_access/event_vault.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendar/classes/local/event/data_access/event_vault.php b/calendar/classes/local/event/data_access/event_vault.php index c24c5f889ce..c6c7c689c01 100644 --- a/calendar/classes/local/event/data_access/event_vault.php +++ b/calendar/classes/local/event/data_access/event_vault.php @@ -164,7 +164,7 @@ class event_vault implements event_vault_interface { $coursesfilter, $where, $params, - "e.timesort ASC, e.id ASC", + "COALESCE(e.timesort, e.timestart) ASC, e.id ASC", $offset, $limitnum, $ignorehidden