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

This commit is contained in:
Sam Hemelryk 2014-05-26 09:53:46 +12:00
commit 9832d18ab5
2 changed files with 6 additions and 5 deletions

View file

@ -54,7 +54,7 @@ class user_profile_viewed extends base {
*/
public function get_description() {
return 'User ' . $this->userid . ' viewed the profile for user ' . $this->relateduserid . ' in the course ' .
$this->other['courseid'];
$this->courseid;
}
/**
@ -63,7 +63,7 @@ class user_profile_viewed extends base {
* @return \moodle_url
*/
public function get_url() {
return new \moodle_url('/user/view.php', array('id' => $this->relateduserid, 'course' => $this->other['courseid']));
return new \moodle_url('/user/view.php', array('id' => $this->relateduserid, 'course' => $this->courseid));
}
/**
@ -72,7 +72,7 @@ class user_profile_viewed extends base {
* @return array
*/
protected function get_legacy_logdata() {
return array($this->other['courseid'], 'user', 'view', 'view.php?id=' . $this->relateduserid . '&course=' .
$this->other['courseid'], $this->relateduserid);
return array($this->courseid, 'user', 'view', 'view.php?id=' . $this->relateduserid . '&course=' .
$this->courseid, $this->relateduserid);
}
}

View file

@ -191,7 +191,8 @@ if ($user->deleted) {
$event = \core\event\user_profile_viewed::create(array(
'objectid' => $USER->id,
'relateduserid' => $user->id,
'context' => $usercontext,
'courseid' => $course->id,
'context' => $coursecontext,
'other' => array(
'courseid' => $course->id,
'courseshortname' => $course->shortname,