diff --git a/lib/classes/event/blog_association_created.php b/lib/classes/event/blog_association_created.php
index 9084d70cc8d..ba083cb8595 100644
--- a/lib/classes/event/blog_association_created.php
+++ b/lib/classes/event/blog_association_created.php
@@ -25,8 +25,6 @@ namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
- * blog_association_created
- *
* Class for event to be triggered when a new blog entry is associated with a context.
*
* @property-read array $other {
diff --git a/lib/classes/event/blog_comment_created.php b/lib/classes/event/blog_comment_created.php
index b5381060274..3c68de270f4 100644
--- a/lib/classes/event/blog_comment_created.php
+++ b/lib/classes/event/blog_comment_created.php
@@ -26,7 +26,7 @@ namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
- * The blog comment created event.
+ * The blog comment created event class.
*
* @package core
* @since Moodle 2.7
diff --git a/lib/classes/event/blog_comment_deleted.php b/lib/classes/event/blog_comment_deleted.php
index 6fa87747b06..adf5c092b94 100644
--- a/lib/classes/event/blog_comment_deleted.php
+++ b/lib/classes/event/blog_comment_deleted.php
@@ -26,7 +26,7 @@ namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
- * The blog comment deleted event.
+ * The blog comment deleted event class.
*
* @package core
* @since Moodle 2.7
diff --git a/lib/classes/event/cohort_created.php b/lib/classes/event/cohort_created.php
index 6a1d2378351..5451a7ab8fd 100644
--- a/lib/classes/event/cohort_created.php
+++ b/lib/classes/event/cohort_created.php
@@ -85,7 +85,7 @@ class cohort_created extends base {
/**
* Return legacy event data.
*
- * @return stdClass
+ * @return \stdClass
*/
protected function get_legacy_eventdata() {
return $this->get_record_snapshot('cohort', $this->objectid);
diff --git a/lib/classes/event/cohort_deleted.php b/lib/classes/event/cohort_deleted.php
index 50bf442c61d..c5f170cc876 100644
--- a/lib/classes/event/cohort_deleted.php
+++ b/lib/classes/event/cohort_deleted.php
@@ -85,7 +85,7 @@ class cohort_deleted extends base {
/**
* Return legacy event data.
*
- * @return stdClass
+ * @return \stdClass
*/
protected function get_legacy_eventdata() {
return $this->get_record_snapshot('cohort', $this->objectid);
diff --git a/lib/classes/event/cohort_member_added.php b/lib/classes/event/cohort_member_added.php
index 922c1559acc..6a944ea68f0 100644
--- a/lib/classes/event/cohort_member_added.php
+++ b/lib/classes/event/cohort_member_added.php
@@ -86,7 +86,7 @@ class cohort_member_added extends base {
/**
* Return legacy event data.
*
- * @return stdClass
+ * @return \stdClass
*/
protected function get_legacy_eventdata() {
$data = new \stdClass();
diff --git a/lib/classes/event/cohort_member_removed.php b/lib/classes/event/cohort_member_removed.php
index e08ece33689..68b29e3ee2b 100644
--- a/lib/classes/event/cohort_member_removed.php
+++ b/lib/classes/event/cohort_member_removed.php
@@ -87,7 +87,7 @@ class cohort_member_removed extends base {
/**
* Return legacy event data.
*
- * @return stdClass
+ * @return \stdClass
*/
protected function get_legacy_eventdata() {
$data = new \stdClass();
diff --git a/lib/classes/event/cohort_updated.php b/lib/classes/event/cohort_updated.php
index 50705fdf75f..83d05b5de9c 100644
--- a/lib/classes/event/cohort_updated.php
+++ b/lib/classes/event/cohort_updated.php
@@ -85,7 +85,7 @@ class cohort_updated extends base {
/**
* Return legacy event data.
*
- * @return stdClass
+ * @return \stdClass
*/
protected function get_legacy_eventdata() {
return $this->get_record_snapshot('cohort', $this->objectid);
diff --git a/lib/classes/event/course_category_deleted.php b/lib/classes/event/course_category_deleted.php
index 446345bd7f0..5c6bbee5a21 100644
--- a/lib/classes/event/course_category_deleted.php
+++ b/lib/classes/event/course_category_deleted.php
@@ -86,7 +86,7 @@ class course_category_deleted extends base {
/**
* Returns the legacy event data.
*
- * @return coursecat the category that was deleted
+ * @return \coursecat the category that was deleted
*/
protected function get_legacy_eventdata() {
return $this->coursecat;
diff --git a/lib/classes/event/course_completed.php b/lib/classes/event/course_completed.php
index 6f028ff4b49..cd4bbdc6e23 100644
--- a/lib/classes/event/course_completed.php
+++ b/lib/classes/event/course_completed.php
@@ -124,6 +124,6 @@ class course_completed extends base {
protected function validate_data() {
parent::validate_data();
- // TODO: MDL-45319 add validation of relateduserid and other['relateduserid'].
+ // TODO: MDL-45445 add validation of relateduserid and other['relateduserid'].
}
}
diff --git a/lib/classes/event/course_content_deleted.php b/lib/classes/event/course_content_deleted.php
index 62c18cfa06e..42161dd9ece 100644
--- a/lib/classes/event/course_content_deleted.php
+++ b/lib/classes/event/course_content_deleted.php
@@ -15,7 +15,7 @@
// along with Moodle. If not, see .
/**
- * Course content_deleted event class.
+ * Course content deleted event.
*
* @package core
* @copyright 2013 Mark Nelson
@@ -27,7 +27,7 @@ namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
- * Course content_deleted event class.
+ * Course content deleted event class.
*
* @property-read array $other {
* Extra information about event.
diff --git a/lib/classes/event/course_user_report_viewed.php b/lib/classes/event/course_user_report_viewed.php
index 1023dc76bfa..c465a03e207 100644
--- a/lib/classes/event/course_user_report_viewed.php
+++ b/lib/classes/event/course_user_report_viewed.php
@@ -106,12 +106,12 @@ class course_user_report_viewed extends \core\event\base {
}
if (empty($this->relateduserid)) {
- throw new \coding_exception('relateduserid needs to be set.');
+ throw new \coding_exception('The \'relateduserid\' must be set.');
}
// Make sure this class is never used without proper object details.
if (!isset($this->other['mode'])) {
- throw new \coding_exception('mode needs to be set in $other.');
+ throw new \coding_exception('The \'mode\' value must be set in other.');
}
}
}
diff --git a/lib/classes/event/email_failed.php b/lib/classes/event/email_failed.php
index 4f550088474..d62e2c79707 100644
--- a/lib/classes/event/email_failed.php
+++ b/lib/classes/event/email_failed.php
@@ -81,13 +81,13 @@ class email_failed extends base {
protected function validate_data() {
parent::validate_data();
if (!isset($this->other['subject'])) {
- throw new \coding_exception('The subject needs to be set in $other');
+ throw new \coding_exception('The \'subject\' value must be set in other.');
}
if (!isset($this->other['message'])) {
- throw new \coding_exception('The message needs to be set in $other');
+ throw new \coding_exception('The \'message\' value must be set in other.');
}
if (!isset($this->other['errorinfo'])) {
- throw new \coding_exception('The error info needs to be set in $other');
+ throw new \coding_exception('The \'errorinfo\' value must be set in other.');
}
}
}
diff --git a/lib/classes/event/group_created.php b/lib/classes/event/group_created.php
index 939291a0d50..504ba3daedf 100644
--- a/lib/classes/event/group_created.php
+++ b/lib/classes/event/group_created.php
@@ -47,7 +47,7 @@ class group_created extends base {
/**
* Legacy event data if get_legacy_eventname() is not empty.
*
- * @return stdClass
+ * @return \stdClass
*/
protected function get_legacy_eventdata() {
return $this->get_record_snapshot('groups', $this->objectid);
diff --git a/lib/classes/event/group_deleted.php b/lib/classes/event/group_deleted.php
index 08a4c5e25c0..22294d15e01 100644
--- a/lib/classes/event/group_deleted.php
+++ b/lib/classes/event/group_deleted.php
@@ -47,7 +47,7 @@ class group_deleted extends base {
/**
* Legacy event data if get_legacy_eventname() is not empty.
*
- * @return stdClass
+ * @return \stdClass
*/
protected function get_legacy_eventdata() {
return $this->get_record_snapshot('groups', $this->objectid);
@@ -90,5 +90,4 @@ class group_deleted extends base {
$this->data['edulevel'] = self::LEVEL_OTHER;
$this->data['objecttable'] = 'groups';
}
-
}
diff --git a/lib/classes/event/group_updated.php b/lib/classes/event/group_updated.php
index 64a060f6fdf..5882b5527a5 100644
--- a/lib/classes/event/group_updated.php
+++ b/lib/classes/event/group_updated.php
@@ -47,7 +47,7 @@ class group_updated extends base {
/**
* Legacy event data if get_legacy_eventname() is not empty.
*
- * @return stdClass
+ * @return \stdClass
*/
protected function get_legacy_eventdata() {
return $this->get_record_snapshot('groups', $this->objectid);
diff --git a/lib/classes/event/grouping_created.php b/lib/classes/event/grouping_created.php
index ceb6973b787..7ab5f79bcde 100644
--- a/lib/classes/event/grouping_created.php
+++ b/lib/classes/event/grouping_created.php
@@ -47,7 +47,7 @@ class grouping_created extends base {
/**
* Legacy event data if get_legacy_eventname() is not empty.
*
- * @return stdClass
+ * @return \stdClass
*/
protected function get_legacy_eventdata() {
return $this->get_record_snapshot('groupings', $this->objectid);
@@ -90,5 +90,4 @@ class grouping_created extends base {
$this->data['edulevel'] = self::LEVEL_OTHER;
$this->data['objecttable'] = 'groupings';
}
-
}
diff --git a/lib/classes/event/grouping_deleted.php b/lib/classes/event/grouping_deleted.php
index b5a3c3df6e1..8a7235ad14b 100644
--- a/lib/classes/event/grouping_deleted.php
+++ b/lib/classes/event/grouping_deleted.php
@@ -54,7 +54,7 @@ class grouping_deleted extends base {
/**
* Legacy event data if get_legacy_eventname() is not empty.
*
- * @return stdClass
+ * @return \stdClass
*/
protected function get_legacy_eventdata() {
return $this->get_record_snapshot('groupings', $this->objectid);
@@ -97,5 +97,4 @@ class grouping_deleted extends base {
$this->data['edulevel'] = self::LEVEL_OTHER;
$this->data['objecttable'] = 'groupings';
}
-
}
diff --git a/lib/classes/event/grouping_updated.php b/lib/classes/event/grouping_updated.php
index 3b5247d5af6..2917da77bff 100644
--- a/lib/classes/event/grouping_updated.php
+++ b/lib/classes/event/grouping_updated.php
@@ -90,5 +90,4 @@ class grouping_updated extends base {
$this->data['edulevel'] = self::LEVEL_OTHER;
$this->data['objecttable'] = 'groupings';
}
-
}
diff --git a/lib/classes/event/user_created.php b/lib/classes/event/user_created.php
index 81310d2297f..b7161793172 100644
--- a/lib/classes/event/user_created.php
+++ b/lib/classes/event/user_created.php
@@ -98,4 +98,19 @@ class user_created extends base {
protected function get_legacy_logdata() {
return array(SITEID, 'user', 'add', '/view.php?id='.$this->objectid, fullname($this->get_legacy_eventdata()));
}
+
+ /**
+ * Custom validation.
+ *
+ * @throws \coding_exception
+ * @return void
+ */
+ protected function validate_data() {
+ parent::validate_data();
+
+ if (!isset($this->relateduserid)) {
+ debugging('The \'relateduserid\' value must be specified in the event.', DEBUG_DEVELOPER);
+ $this->relateduserid = $this->objectid;
+ }
+ }
}
diff --git a/lib/classes/event/user_deleted.php b/lib/classes/event/user_deleted.php
index 488863d7315..877ec5a46cd 100644
--- a/lib/classes/event/user_deleted.php
+++ b/lib/classes/event/user_deleted.php
@@ -26,7 +26,7 @@ namespace core\event;
defined('MOODLE_INTERNAL') || die();
/**
- * Event when user profile is deleted.
+ * User deleted event class.
*
* @property-read array $other {
* Extra information about event.
@@ -116,24 +116,29 @@ class user_deleted extends base {
protected function validate_data() {
parent::validate_data();
+ if (!isset($this->relateduserid)) {
+ debugging('The \'relateduserid\' value must be specified in the event.', DEBUG_DEVELOPER);
+ $this->relateduserid = $this->objectid;
+ }
+
if (!isset($this->other['username'])) {
- throw new \coding_exception('username must be set in $other.');
+ throw new \coding_exception('The \'username\' value must be set in other.');
}
if (!isset($this->other['email'])) {
- throw new \coding_exception('email must be set in $other.');
+ throw new \coding_exception('The \'email\' value must be set in other.');
}
if (!isset($this->other['idnumber'])) {
- throw new \coding_exception('idnumber must be set in $other.');
+ throw new \coding_exception('The \'idnumber\' value must be set in other.');
}
if (!isset($this->other['picture'])) {
- throw new \coding_exception('picture must be set in $other.');
+ throw new \coding_exception('The \'picture\' value must be set in other.');
}
if (!isset($this->other['mnethostid'])) {
- throw new \coding_exception('mnethostid must be set in $other.');
+ throw new \coding_exception('The \'mnethostid\' value must be set in other.');
}
}
}
diff --git a/lib/classes/event/user_enrolment_created.php b/lib/classes/event/user_enrolment_created.php
index 63364e96dd3..3ea29bb2b1c 100644
--- a/lib/classes/event/user_enrolment_created.php
+++ b/lib/classes/event/user_enrolment_created.php
@@ -122,7 +122,7 @@ class user_enrolment_created extends base {
}
if (!isset($this->other['enrol'])) {
- throw new \coding_exception('The \'enrol\' value must be set in $other.');
+ throw new \coding_exception('The \'enrol\' value must be set in other.');
}
}
}
diff --git a/lib/classes/event/user_enrolment_deleted.php b/lib/classes/event/user_enrolment_deleted.php
index 74b33e876eb..30dff690df3 100644
--- a/lib/classes/event/user_enrolment_deleted.php
+++ b/lib/classes/event/user_enrolment_deleted.php
@@ -115,13 +115,13 @@ class user_enrolment_deleted extends base {
protected function validate_data() {
parent::validate_data();
if (!isset($this->other['userenrolment'])) {
- throw new \coding_exception('User enrolment must be set in $other.');
+ throw new \coding_exception('The \'userenrolment\' value must be set in other.');
}
if (!isset($this->other['enrol'])) {
- throw new \coding_exception('Enrolment plugin name must be set in $other.');
+ throw new \coding_exception('The \'enrol\' value must be set in other.');
}
if (!isset($this->relateduserid)) {
- throw new \coding_exception('Related user id must be set.');
+ throw new \coding_exception('The \'relateduserid\' must be set.');
}
}
}
diff --git a/lib/classes/event/user_enrolment_updated.php b/lib/classes/event/user_enrolment_updated.php
index 4482d89c815..0570cf8da08 100644
--- a/lib/classes/event/user_enrolment_updated.php
+++ b/lib/classes/event/user_enrolment_updated.php
@@ -108,10 +108,10 @@ class user_enrolment_updated extends base {
protected function validate_data() {
parent::validate_data();
if (!isset($this->other['enrol'])) {
- throw new \coding_exception('Enrolment plugin name must be set in $other.');
+ throw new \coding_exception('The \'enrol\' value must be set in other.');
}
if (!isset($this->relateduserid)) {
- throw new \coding_exception('Related user id must be set.');
+ throw new \coding_exception('The \'relateduserid\' must be set.');
}
}
}
diff --git a/lib/classes/event/user_password_updated.php b/lib/classes/event/user_password_updated.php
index 46f08ca28cf..ef7dbe8b538 100644
--- a/lib/classes/event/user_password_updated.php
+++ b/lib/classes/event/user_password_updated.php
@@ -123,11 +123,11 @@ class user_password_updated extends base {
parent::validate_data();
if (!$this->relateduserid) {
- throw new \coding_exception('relateduserid needs to be set.');
+ throw new \coding_exception('The \'relateduserid\' must be set.');
}
if (!isset($this->other['forgottenreset'])) {
- throw new \coding_exception('forgottenreset needs to be set in $other.');
+ throw new \coding_exception('The \'forgottenreset\' value must be set in other.');
}
}
}
diff --git a/lib/classes/event/user_updated.php b/lib/classes/event/user_updated.php
index 1cbfd08c0c4..a8ef5c5500e 100644
--- a/lib/classes/event/user_updated.php
+++ b/lib/classes/event/user_updated.php
@@ -98,4 +98,19 @@ class user_updated extends base {
protected function get_legacy_logdata() {
return array(SITEID, 'user', 'update', 'view.php?id='.$this->objectid, '');
}
+
+ /**
+ * Custom validation.
+ *
+ * @throws \coding_exception
+ * @return void
+ */
+ protected function validate_data() {
+ parent::validate_data();
+
+ if (!isset($this->relateduserid)) {
+ debugging('The \'relateduserid\' value must be specified in the event.', DEBUG_DEVELOPER);
+ $this->relateduserid = $this->objectid;
+ }
+ }
}
diff --git a/lib/classes/event/webservice_login_failed.php b/lib/classes/event/webservice_login_failed.php
index 07781af5e76..e65e6e1bba6 100644
--- a/lib/classes/event/webservice_login_failed.php
+++ b/lib/classes/event/webservice_login_failed.php
@@ -120,7 +120,7 @@ class webservice_login_failed extends base {
} else if (!isset($this->other['method'])) {
throw new \coding_exception('The \'method\' value must be set in other.');
} else if (isset($this->other['token'])) {
- throw new \coding_exception('The token cannot be set in $other.');
+ throw new \coding_exception('The \'token\' value must not be set in other.');
}
}
}
diff --git a/lib/classes/event/webservice_service_user_added.php b/lib/classes/event/webservice_service_user_added.php
index 7aa126a63b9..9a3f3e68843 100644
--- a/lib/classes/event/webservice_service_user_added.php
+++ b/lib/classes/event/webservice_service_user_added.php
@@ -89,12 +89,13 @@ class webservice_service_user_added extends base {
/**
* Custom validation.
*
+ * @throws \coding_exception
* @return void
*/
protected function validate_data() {
parent::validate_data();
if (!isset($this->relateduserid)) {
- throw new \coding_exception('The relateduserid must be set.');
+ throw new \coding_exception('The \'relateduserid\' must be set.');
}
}
diff --git a/lib/classes/event/webservice_service_user_removed.php b/lib/classes/event/webservice_service_user_removed.php
index 41af410a09f..c2248d82d94 100644
--- a/lib/classes/event/webservice_service_user_removed.php
+++ b/lib/classes/event/webservice_service_user_removed.php
@@ -89,12 +89,13 @@ class webservice_service_user_removed extends base {
/**
* Custom validation.
*
+ * @throws \coding_exception
* @return void
*/
protected function validate_data() {
parent::validate_data();
if (!isset($this->relateduserid)) {
- throw new \coding_exception('The relateduserid must be set.');
+ throw new \coding_exception('The \'relateduserid\' must be set.');
}
}
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index f736531c414..36dfc72eff3 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4283,6 +4283,7 @@ function delete_user(stdClass $user) {
$event = \core\event\user_deleted::create(
array(
'objectid' => $user->id,
+ 'relateduserid' => $user->id,
'context' => $usercontext,
'other' => array(
'username' => $user->username,
@@ -4733,8 +4734,9 @@ function update_internal_user_password($user, $password) {
// Trigger event.
$event = \core\event\user_updated::create(array(
- 'objectid' => $user->id,
- 'context' => context_user::instance($user->id)
+ 'objectid' => $user->id,
+ 'relateduserid' => $user->id,
+ 'context' => context_user::instance($user->id)
));
$event->add_record_snapshot('user', $user);
$event->trigger();
@@ -5972,6 +5974,7 @@ function setnew_password_and_mail($user, $fasthash = false) {
// Trigger event.
$event = \core\event\user_updated::create(array(
'objectid' => $user->id,
+ 'relateduserid' => $user->id,
'context' => context_user::instance($user->id)
));
$event->add_record_snapshot('user', $user);
diff --git a/mod/chat/classes/event/message_sent.php b/mod/chat/classes/event/message_sent.php
index 92be40cd474..d695f82a89f 100644
--- a/mod/chat/classes/event/message_sent.php
+++ b/mod/chat/classes/event/message_sent.php
@@ -97,5 +97,4 @@ class message_sent extends \core\event\base {
throw new \coding_exception('The \'relateduserid\' must be set.');
}
}
-
}
diff --git a/mod/workshop/classes/event/assessable_uploaded.php b/mod/workshop/classes/event/assessable_uploaded.php
index 1eb9a6945fb..1b7ec4d6c74 100644
--- a/mod/workshop/classes/event/assessable_uploaded.php
+++ b/mod/workshop/classes/event/assessable_uploaded.php
@@ -135,5 +135,4 @@ class assessable_uploaded extends \core\event\assessable_uploaded {
public function set_legacy_logdata($legacylogdata) {
$this->legacylogdata = $legacylogdata;
}
-
}
diff --git a/report/completion/classes/event/report_viewed.php b/report/completion/classes/event/report_viewed.php
index d9ea7bb3641..9e3021488ce 100644
--- a/report/completion/classes/event/report_viewed.php
+++ b/report/completion/classes/event/report_viewed.php
@@ -86,4 +86,3 @@ class report_viewed extends \core\event\base {
}
}
}
-
diff --git a/report/completion/classes/event/user_report_viewed.php b/report/completion/classes/event/user_report_viewed.php
index 4208e02cbc2..ca046c59e6c 100644
--- a/report/completion/classes/event/user_report_viewed.php
+++ b/report/completion/classes/event/user_report_viewed.php
@@ -96,4 +96,3 @@ class user_report_viewed extends \core\event\base {
}
}
}
-
diff --git a/report/log/classes/event/report_viewed.php b/report/log/classes/event/report_viewed.php
index 7eb669ccb93..d8ef4b46ec9 100644
--- a/report/log/classes/event/report_viewed.php
+++ b/report/log/classes/event/report_viewed.php
@@ -119,9 +119,8 @@ class report_viewed extends \core\event\base {
throw new \coding_exception('The \'logformat\' value must be set in other.');
}
- if (!isset($this->data['relateduserid'])) {
+ if (!isset($this->relateduserid)) {
throw new \coding_exception('The \'relateduserid\' must be set.');
}
}
}
-
diff --git a/report/log/classes/event/user_report_viewed.php b/report/log/classes/event/user_report_viewed.php
index bd2c86051b3..d553306d0f4 100644
--- a/report/log/classes/event/user_report_viewed.php
+++ b/report/log/classes/event/user_report_viewed.php
@@ -101,9 +101,8 @@ class user_report_viewed extends \core\event\base {
throw new \coding_exception('The \'mode\' value must be set in other.');
}
- if (empty($this->data['relateduserid'])) {
+ if (empty($this->relateduserid)) {
throw new \coding_exception('The \'relateduserid\' must be set.');
}
}
}
-
diff --git a/report/loglive/classes/event/report_viewed.php b/report/loglive/classes/event/report_viewed.php
index 6ca70a04d00..f37ae0301e9 100644
--- a/report/loglive/classes/event/report_viewed.php
+++ b/report/loglive/classes/event/report_viewed.php
@@ -81,4 +81,3 @@ class report_viewed extends \core\event\base {
return new \moodle_url('/report/loglive/index.php', array('id' => $this->courseid));
}
}
-
diff --git a/report/outline/classes/event/report_viewed.php b/report/outline/classes/event/report_viewed.php
index efc38d6929c..8bd4f554b4d 100644
--- a/report/outline/classes/event/report_viewed.php
+++ b/report/outline/classes/event/report_viewed.php
@@ -101,7 +101,7 @@ class report_viewed extends \core\event\base {
if (empty($this->other['mode'])) {
throw new \coding_exception('The \'mode\' value must be set in other.');
}
- if (empty($this->data['relateduserid'])) {
+ if (empty($this->relateduserid)) {
throw new \coding_exception('The \'relateduserid\' must be set.');
}
}
diff --git a/report/stats/classes/event/report_viewed.php b/report/stats/classes/event/report_viewed.php
index 45b4b7e6bd1..e485a79808f 100644
--- a/report/stats/classes/event/report_viewed.php
+++ b/report/stats/classes/event/report_viewed.php
@@ -110,7 +110,7 @@ class report_viewed extends \core\event\base {
throw new \coding_exception('The \'mode\' value must be set in other.');
}
- if (!isset($this->data['relateduserid'])) {
+ if (!isset($this->relateduserid)) {
throw new \coding_exception('The \'relateduserid\' must be set.');
}
}
diff --git a/report/stats/classes/event/user_report_viewed.php b/report/stats/classes/event/user_report_viewed.php
index ce160200e79..3854175dfab 100644
--- a/report/stats/classes/event/user_report_viewed.php
+++ b/report/stats/classes/event/user_report_viewed.php
@@ -90,7 +90,7 @@ class user_report_viewed extends \core\event\base {
*/
protected function validate_data() {
parent::validate_data();
- if (empty($this->data['relateduserid'])) {
+ if (empty($this->relateduserid)) {
throw new \coding_exception('The \'relateduserid\' must be set.');
}
}
diff --git a/user/lib.php b/user/lib.php
index 61525380462..aee893b2b52 100644
--- a/user/lib.php
+++ b/user/lib.php
@@ -91,6 +91,7 @@ function user_create_user($user, $updatepassword = true) {
$event = \core\event\user_created::create(
array(
'objectid' => $newuserid,
+ 'relateduserid' => $newuserid,
'context' => $usercontext
)
);
@@ -169,6 +170,7 @@ function user_update_user($user, $updatepassword = true) {
$event = \core\event\user_updated::create(
array(
'objectid' => $user->id,
+ 'relateduserid' => $user->id,
'context' => context_user::instance($user->id)
)
);