Merge branch 'MDL-48534_m28' of https://github.com/markn86/moodle into MOODLE_28_STABLE

2014-12-22 13:52:41 +00:00
parent 03d3dfbfc5 a2a8653aa2
commit 7c4b6a84dd
1 changed files with 8 additions and 6 deletions
@@ -3055,16 +3055,18 @@ class assign {
            if ($grade->grade !== null && $grade->grade >= 0) {
                $data->grade = format_float($grade->grade, 2);
            }
-            if (!empty($flags->workflowstate)) {
-                $data->workflowstate = $flags->workflowstate;
-            }
-            if (!empty($flags->allocatedmarker)) {
-                $data->allocatedmarker = $flags->allocatedmarker;
-            }
        } else {
            $data = new stdClass();
            $data->grade = '';
        }
+
+        if (!empty($flags->workflowstate)) {
+            $data->workflowstate = $flags->workflowstate;
+        }
+        if (!empty($flags->allocatedmarker)) {
+            $data->allocatedmarker = $flags->allocatedmarker;
+        }
+
        // Warning if required.
        $allsubmissions = $this->get_all_submissions($userid);