From c447c0353859ebdc5ec367012184a1e8890038f5 Mon Sep 17 00:00:00 2001
From: Adam Olley <adam.olley@netspot.com.au>
Date: Thu, 18 Apr 2013 14:16:25 +0930
Subject: [PATCH] MDL-38655: mod_assign: Use correct ordering on cap checks for
 submission downloads

---
 mod/assign/locallib.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 62f0678ce5d..9e6e963a0f3 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -3203,12 +3203,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) {
@@ -3227,7 +3227,10 @@ class assign {
     public function can_view_submission($userid) {
         global $USER;
 
-        if (is_siteadmin()) {
+        if (!$this->is_active_user($userid) && !has_capability('moodle/course:viewsuspendedusers', $this->context)) {
+            return false;
+        }
+        if (has_capability('mod/assign:grade', $this->context)) {
             return true;
         }
         if (!is_enrolled($this->get_course_context(), $userid)) {
@@ -3236,12 +3239,6 @@ class assign {
         if ($userid == $USER->id && has_capability('mod/assign:submit', $this->context)) {
             return true;
         }
-        if (!$this->is_active_user($userid) && !has_capability('moodle/course:viewsuspendedusers', $this->context)) {
-            return false;
-        }
-        if (has_capability('mod/assign:grade', $this->context)) {
-            return true;
-        }
         return false;
     }