Importing fix for bug #2004 (Bug of the Year! :D) from HEAD:
Events in each day are now displayed ordered by starting time, and not by eventid as before. Thanks to Gustav for pointing this out!
This commit is contained in:
+2
-3
@@ -112,7 +112,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
|
||||
$events = array();
|
||||
}
|
||||
else {
|
||||
$events = get_records_select('event', $whereclause);
|
||||
$events = get_records_select('event', $whereclause, 'timestart');
|
||||
}
|
||||
|
||||
// This is either a genius idea or an idiot idea: in order to not complicate things, we use this rule: if, after
|
||||
@@ -297,8 +297,7 @@ function calendar_get_upcoming($courses, $groups, $users, $daysinfuture, $maxeve
|
||||
if ($whereclause === false) {
|
||||
$events = false;
|
||||
} else {
|
||||
$whereclause .= ' ORDER BY timestart'; // We want them this way
|
||||
$events = get_records_select('event', $whereclause);
|
||||
$events = get_records_select('event', $whereclause, 'timestart');
|
||||
}
|
||||
|
||||
// This is either a genius idea or an idiot idea: in order to not complicate things, we use this rule: if, after
|
||||
|
||||
+1
-1
@@ -312,7 +312,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
|
||||
$events = array();
|
||||
}
|
||||
else {
|
||||
$events = get_records_select('event', $whereclause);
|
||||
$events = get_records_select('event', $whereclause, 'timestart');
|
||||
}
|
||||
|
||||
// Extract information: events vs. time
|
||||
|
||||
Reference in New Issue
Block a user