MDL-38655: mod_assign: Use correct ordering on cap checks for submission downloads

This commit is contained in:
Adam Olley
2013-09-27 12:45:47 +09:30
parent 7bc37de925
commit 6e3013be7c
+5 -5
View File
@@ -2692,12 +2692,12 @@ class assign {
public function can_view_group_submission($groupid) {
global $USER;
if (!is_enrolled($this->get_course_context(), $USER->id)) {
return false;
}
if (has_capability('mod/assign:grade', $this->context)) {
return true;
}
if (!is_enrolled($this->get_course_context(), $USER->id)) {
return false;
}
$members = $this->get_submission_group_members($groupid, true);
foreach ($members as $member) {
if ($member->id == $USER->id) {
@@ -2716,7 +2716,7 @@ class assign {
public function can_view_submission($userid) {
global $USER;
if (is_siteadmin()) {
if (has_capability('mod/assign:grade', $this->context)) {
return true;
}
if (!is_enrolled($this->get_course_context(), $userid)) {
@@ -2725,7 +2725,7 @@ class assign {
if ($userid == $USER->id && !has_capability('mod/assign:submit', $this->context)) {
return false;
}
if ($userid != $USER->id && !has_capability('mod/assign:grade', $this->context)) {
if ($userid != $USER->id) {
return false;
}
return true;