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

This reverts commit 7c4b6a84dd, reversing changes made to 03d3dfbfc5.
2014-12-23 10:46:30 +00:00
parent 008e28478d
commit db5fb4ce76
1 changed files with 6 additions and 8 deletions
@@ -3055,18 +3055,16 @@ 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);