Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle

This commit is contained in:
Dan Poltawski
2013-06-12 16:47:38 +08:00
-2
View File
@@ -207,12 +207,10 @@ class assign_grading_table extends table_sql implements renderable {
if ($workflowfilter == ASSIGN_MARKING_WORKFLOW_STATE_NOTMARKED) {
$where .= ' AND (uf.workflowstate = :workflowstate OR uf.workflowstate IS NULL OR '.
$DB->sql_isempty('assign_user_flags', 'workflowstate', true, true).')';
echo $where;
$params['workflowstate'] = $workflowfilter;
} else {
$where .= ' AND uf.workflowstate = :workflowstate';
$params['workflowstate'] = $workflowfilter;
echo $where;
}
}
}