Skip to content
Browse files

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!
  • Loading branch information...
1 parent 7747441 commit d907cdad93880346d2815a6a6d3740cf709ebedf defacer committed Oct 29, 2004
Showing with 3 additions and 4 deletions.
  1. +2 −3 calendar/lib.php
  2. +1 −1 calendar/view.php
View
5 calendar/lib.php
@@ -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
View
2 calendar/view.php
@@ -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

0 comments on commit d907cda

Please sign in to comment.
Something went wrong with that request. Please try again.