Merge branch 'MDL-58393-32_filter-order' of https://github.com/roperto/moodle into MOODLE_32_STABLE

This commit is contained in:
Dan Poltawski
2017-04-17 10:30:41 +01:00
+1 -1
View File
@@ -1027,7 +1027,7 @@ function filter_preload_activities(course_modinfo $modinfo) {
// Get all filter_active rows relating to all these contexts
list ($sql, $params) = $DB->get_in_or_equal($allcontextids);
$filteractives = $DB->get_records_select('filter_active', "contextid $sql", $params);
$filteractives = $DB->get_records_select('filter_active', "contextid $sql", $params, 'sortorder');
// Get all filter_config only for the cm contexts
list ($sql, $params) = $DB->get_in_or_equal($cmcontextids);