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

2015-01-06 11:11:47 +00:00
parent b21d1db3c3 9caa4c6005
commit ec82925fb5
1 changed files with 8 additions and 6 deletions
@@ -2987,16 +2987,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);