Merge branch 'MDL-55867_m31v1' of https://github.com/sbourget/moodle into MOODLE_31_STABLE

2017-02-22 09:34:19 +01:00
parent 5a6e167a0b 4f865489f0
commit 5911ac9525
1 changed files with 1 additions and 0 deletions
@@ -49,6 +49,7 @@ class block_activity_results_edit_form extends block_edit_form {
        $sql = 'SELECT id, itemname FROM {grade_items} WHERE courseid = ? and itemtype = ? and (gradetype = ? or gradetype = ?)';
        $params = array($this->page->course->id, 'mod', GRADE_TYPE_VALUE, GRADE_TYPE_SCALE);
        $activities = $DB->get_records_sql_menu($sql, $params);
+        core_collator::asort($activities);

        if (empty($activities)) {
            $mform->addElement('static', 'noactivitieswarning', get_string('config_select_activity', 'block_activity_results'),