From db5fb4ce769daae3c874c1902101e4344c7cbc35 Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Tue, 23 Dec 2014 10:46:30 +0000
Subject: [PATCH] Revert "Merge branch 'MDL-48534_m28' of
 https://github.com/markn86/moodle into MOODLE_28_STABLE"

This reverts commit 7c4b6a84dd436e7df501c5ee8eefb91490dd76be, reversing
changes made to 03d3dfbfc5d892b844b57ef3ad1b812907e22904.
---
 mod/assign/locallib.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 8e501fc0642..6bf4342e0e6 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -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);