L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-58262 assign: Use unique sql parameter

Browse Source
This commit is contained in:
Eric Merrill
2017-03-14 15:09:27 -04:00
parent 1034421264
commit 28cdba9dcf
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/gradingtable.php
+8 -8
View File
@@ -131,12 +131,6 @@ class assign_grading_table extends table_sql implements renderable {
$params['assignmentid2'] = (int)$this->assignment->get_instance()->id;
$params['assignmentid3'] = (int)$this->assignment->get_instance()->id;
$params['assignmentid5'] = (int)$this->assignment->get_instance()->id;
$params['assignmentid6'] = (int)$this->assignment->get_instance()->id;
$params['assignmentid7'] = (int)$this->assignment->get_instance()->id;
$params['assignmentid8'] = (int)$this->assignment->get_instance()->id;
$params['assignmentid9'] = (int)$this->assignment->get_instance()->id;
$extrauserfields = get_extra_user_fields($this->assignment->get_context());
$fields = user_picture::fields('u', $extrauserfields) . ', ';
@@ -187,6 +181,12 @@ class assign_grading_table extends table_sql implements renderable {
$hasoverrides = $this->assignment->has_overrides();
if ($hasoverrides) {
$params['assignmentid5'] = (int)$this->assignment->get_instance()->id;
$params['assignmentid6'] = (int)$this->assignment->get_instance()->id;
$params['assignmentid7'] = (int)$this->assignment->get_instance()->id;
$params['assignmentid8'] = (int)$this->assignment->get_instance()->id;
$params['assignmentid9'] = (int)$this->assignment->get_instance()->id;
$fields .= ', priority.priority, ';
$fields .= 'effective.allowsubmissionsfromdate, ';
$fields .= 'effective.duedate, ';
@@ -252,8 +252,8 @@ class assign_grading_table extends table_sql implements renderable {
if (!empty($this->assignment->get_instance()->blindmarking)) {
$from .= 'LEFT JOIN {assign_user_mapping} um
ON u.id = um.userid
AND um.assignment = :assignmentid5 ';
$params['assignmentid5'] = (int)$this->assignment->get_instance()->id;
AND um.assignment = :assignmentidblind ';
$params['assignmentidblind'] = (int)$this->assignment->get_instance()->id;
$fields .= ', um.id as recordid ';
}