Merge branch 'MDL-46721-31' of git://github.com/cameron1729/moodle into MOODLE_31_STABLE

2016-06-07 12:12:37 +01:00
parent adaf294a75 2e458712c8
commit 7512e4d33c
1 changed files with 4 additions and 6 deletions
@@ -5466,11 +5466,9 @@ class assign {
     * @param int $updatetime
     * @return void
     */
-    public function send_notification($userfrom,
-                                      $userto,
-                                      $messagetype,
-                                      $eventtype,
-                                      $updatetime) {
+    public function send_notification($userfrom, $userto, $messagetype, $eventtype, $updatetime) {
+        global $USER;
+        $uniqueid = $this->get_uniqueid_for_user(core_user::is_real_user($userfrom->id) ? $userfrom->id : $USER->id);
        self::send_assignment_notification($userfrom,
                                           $userto,
                                           $messagetype,
@@ -5482,7 +5480,7 @@ class assign {
                                           $this->get_module_name(),
                                           $this->get_instance()->name,
                                           $this->is_blind_marking(),
-                                           $this->get_uniqueid_for_user($userfrom->id));
+                                           $uniqueid);
    }

    /**