Merge branch 'w33_MDL-28982_m21_sqlfullname' of git://github.com/skodak/moodle into MOODLE_21_STABLE
This commit is contained in:
@@ -520,7 +520,7 @@ class quiz_grading_report extends quiz_default_report {
|
||||
*/
|
||||
protected function get_usage_ids_where_question_in_state($summarystate, $slot,
|
||||
$questionid = null, $orderby = 'random', $page = 0, $pagesize = null) {
|
||||
global $CFG;
|
||||
global $CFG, $DB;
|
||||
$dm = new question_engine_data_mapper();
|
||||
|
||||
if ($pagesize && $orderby != 'random') {
|
||||
@@ -544,7 +544,7 @@ class quiz_grading_report extends quiz_default_report {
|
||||
} else if ($orderby == 'student' || $orderby == 'idnumber') {
|
||||
$qubaids->from .= " JOIN {user} u ON quiza.userid = u.id ";
|
||||
if ($orderby == 'student') {
|
||||
$orderby = sql_fullname('u.firstname', 'u.lastname');
|
||||
$orderby = $DB->sql_fullname('u.firstname', 'u.lastname');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user