MDL-43230 badges: move badge revoke event into api

badges/award.php

@@ -180,11 +180,6 @@ if ($award && data_submitted() && has_capability('moodle/badges:awardbadge', $co
     foreach ($users as $user) {
         if (!process_manual_revoke($user->id, $USER->id, $issuerrole->roleid, $badgeid)) {
             echo $OUTPUT->error_text(get_string('error:cannotrevokebadge', 'badges'));
-        } else {
-            // Trigger event, badge revoked.
-            $eventparams = array('objectid' => $badgeid, 'context' => $PAGE->context);
-            $event = \core\event\badge_revoked::create($eventparams);
-            $event->trigger();
         }
     }
 

badges/lib/awardlib.php

@@ -262,6 +262,17 @@ function process_manual_revoke($recipientid, $issuerid, $issuerrole, $badgeid) {
                                                             'recipientid' => $recipientid))
             && $DB->delete_records('badge_issued', array('badgeid' => $badgeid,
                                                       'userid' => $recipientid))) {
+
+            // Trigger event, badge revoked.
+            $badge = new \badge($badgeid);
+            $eventparams = array(
+                'objectid' => $badgeid,
+                'relateduserid' => $recipientid,
+                'context' => $badge->get_context()
+            );
+            $event = \core\event\badge_revoked::create($eventparams);
+            $event->trigger();
+
             return true;
         }
     } else {