moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
lib/classes/event/user_profile_viewed.php
View file

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

3
user/view.php
View file

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