L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-44746_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE

Browse Source
This commit is contained in:
Marina Glancy
2014-04-01 13:52:52 +08:00
parent 3b7b097f2a d27dadca87
commit d19792d5de
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/event/user_deleted.php
+24 -27
View File
@@ -58,8 +58,7 @@ class user_deleted extends base {
* @return string
*/
public function get_description() {
$user = $this->get_record_snapshot('user', $this->data['objectid']);
return 'User profile deleted for userid ' . $user->id;
return 'User profile deleted for the user with the id ' . $this->objectid;
}
/**
@@ -77,12 +76,13 @@ class user_deleted extends base {
* @return \stdClass user data.
*/
protected function get_legacy_eventdata() {
$user = $this->get_record_snapshot('user', $this->data['objectid']);
$user = $this->get_record_snapshot('user', $this->objectid);
$user->deleted = 0;
$user->username = $this->data['other']['username'];
$user->email = $this->data['other']['email'];
$user->idnumber = $this->data['other']['idnumber'];
$user->picture = $this->data['other']['picture'];
$user->username = $this->other['username'];
$user->email = $this->other['email'];
$user->idnumber = $this->other['idnumber'];
$user->picture = $this->other['picture'];
return $user;
}
@@ -92,8 +92,8 @@ class user_deleted extends base {
* @return array
*/
protected function get_legacy_logdata() {
$user = $this->get_record_snapshot('user', $this->data['objectid']);
return array(SITEID, 'user', 'delete', "view.php?id=".$user->id, $user->firstname.' '.$user->lastname);
$user = $this->get_record_snapshot('user', $this->objectid);
return array(SITEID, 'user', 'delete', 'view.php?id=' . $user->id, $user->firstname . ' ' . $user->lastname);
}
/**
@@ -103,29 +103,26 @@ class user_deleted extends base {
* @return void
*/
protected function validate_data() {
global $CFG;
parent::validate_data();
if ($CFG->debugdeveloper) {
parent::validate_data();
if (!isset($this->other['username'])) {
throw new \coding_exception('username must be set in $other.');
}
if (!isset($this->other['username'])) {
throw new \coding_exception('username must be set in $other.');
}
if (!isset($this->other['email'])) {
throw new \coding_exception('email must be set in $other.');
}
if (!isset($this->other['email'])) {
throw new \coding_exception('email must be set in $other.');
}
if (!isset($this->other['idnumber'])) {
throw new \coding_exception('idnumber must be set in $other.');
}
if (!isset($this->other['idnumber'])) {
throw new \coding_exception('idnumber must be set in $other.');
}
if (!isset($this->other['picture'])) {
throw new \coding_exception('picture must be set in $other.');
}
if (!isset($this->other['picture'])) {
throw new \coding_exception('picture must be set in $other.');
}
if (!isset($this->other['mnethostid'])) {
throw new \coding_exception('mnethostid must be set in $other.');
}
if (!isset($this->other['mnethostid'])) {
throw new \coding_exception('mnethostid must be set in $other.');
}
}
}