Merge branch 'wip-mdl-27521-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE

2011-11-08 15:18:42 +08:00
parent f598387441 5e876cd379
commit 40b90130a0
1 changed files with 10 additions and 0 deletions
@@ -918,9 +918,14 @@ class assignment_upload extends assignment_base {
    }

    function can_unfinalize($submission) {
+        if(is_bool($submission)) {
+            return false;
+        }
+
        if (!$this->drafts_tracked()) {
            return false;
        }
+
        if (has_capability('mod/assignment:grade', $this->context)
          and $this->isopen()
          and $this->is_finalized($submission)) {
@@ -932,6 +937,11 @@ class assignment_upload extends assignment_base {

    function can_finalize($submission) {
        global $USER;
+
+        if(is_bool($submission)) {
+            return false;
+        }
+
        if (!$this->drafts_tracked()) {
            return false;
        }