moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for bug #2004 (Bug of the Year! :D):

Browse source 
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:
defacer 2004-10-29 17:21:19 +00:00
parent 21fca825f2
commit a94329a8ed
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
calendar/lib.php
View file

@ -112,7 +112,7 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
$events = array(); $events = array();
} }
else { 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 // 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) { if ($whereclause === false) {
$events = false; $events = false;
} else { } else {
$whereclause .= ' ORDER BY timestart'; // We want them this way $events = get_records_select('event', $whereclause, 'timestart');
$events = get_records_select('event', $whereclause);
} }
// This is either a genius idea or an idiot idea: in order to not complicate things, we use this rule: if, after // This is either a genius idea or an idiot idea: in order to not complicate things, we use this rule: if, after

2
calendar/view.php
View file

@ -312,7 +312,7 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
$events = array(); $events = array();
} }
else { else {
$events = get_records_select('event', $whereclause); $events = get_records_select('event', $whereclause, 'timestart');
} }
// Extract information: events vs. time // Extract information: events vs. time