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

Conflicts:
	mod/assign/locallib.php

diff --cc mod/assign/feedback/file/locallib.php
Simple merge

diff --cc mod/assign/locallib.php
index 6b4b8ed,09ba8c9..8bdc7b5
--- 1/mod/assign/locallib.php
--- 2/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@@ -1476,25 -1512,8 +1512,25 @@@ class assign 
          return true;
      }
  
 +    /**
 +     * Mark in the database that this grade record should have an update notification sent by cron.
 +     *
 +     * @param stdClass $grade a grade record keyed on id
 +     * @return bool true for success
 +     */
 +    public function notify_grade_modified($grade) {
 +        global $DB;
 +
 +        $grade->timemodified = time();
 +        if ($grade->mailed != 1) {
 +            $grade->mailed = 0;
 +        }
 +
 +        return $DB->update_record('assign_grades', $grade);
 +    }
 +
      /**
-      * Update a grade in the grade table for the assignment and in the gradebook
+      * Update a grade in the grade table for the assignment and in the gradebook.
       *
       * @param stdClass $grade a grade record keyed on id
       * @return bool true for success
@@@ -3733,9 -3923,8 +3944,9 @@@
              }
  
              $this->update_grade($grade);
 +            $this->notify_grade_modified($grade);
  
-             // save outcomes
+             // Save outcomes.
              if ($CFG->enableoutcomes) {
                  $data = array();
                  foreach ($modified->gradinginfo->outcomes as $outcomeid => $outcome) {