From: Sam Hemelryk <sam@moodle.com>
Date: Sun, 27 Jul 2014 20:46:03 +0000 (+1200)
Subject: Merge branch 'MDL-46506-master' of git://github.com/damyon/moodle
X-Git-Tag: v2.8.0-beta~485
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=db28260c29b695dbd9b9f3f4e0ae41ea88178a36;hp=896506e4df11ea40ebb8105724deef006b8d39c6

Merge branch 'MDL-46506-master' of git://github.com/damyon/moodle
---

diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index ed5f3ed5f7c..46404bc7eb3 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -1888,12 +1888,12 @@ class assign {
         if (!$batchusers) {
             $userid = required_param('userid', PARAM_INT);
 
-            $grade = $this->get_user_grade($userid, false);
+            $flags = $this->get_user_flags($userid, false);
 
             $user = $DB->get_record('user', array('id'=>$userid), '*', MUST_EXIST);
 
-            if ($grade) {
-                $data->extensionduedate = $grade->extensionduedate;
+            if ($flags) {
+                $data->extensionduedate = $flags->extensionduedate;
             }
             $data->userid = $userid;
         } else {