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

Merge branch 'MDL-48525-master' of git://github.com/jleyva/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2015-02-03 00:57:37 +01:00
parent bd6a0c5df1 a86f23cd53
commit 968e8dc94b
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/externallib.php
+10 -12
View File
@@ -444,12 +444,11 @@ class core_message_external extends external_api {
'unread' => $contact->messagecount
);
// Try to get the user picture, but sometimes this method can return null.
$userdetails = user_get_user_details($contact, null, array('profileimageurl', 'profileimageurlsmall'));
if (!empty($userdetails)) {
$newcontact['profileimageurl'] = $userdetails['profileimageurl'];
$newcontact['profileimageurlsmall'] = $userdetails['profileimageurlsmall'];
}
$usercontextid = context_user::instance($contact->id)->id;
$newcontact['profileimageurl'] = moodle_url::make_webservice_pluginfile_url(
$usercontextid, 'user', 'icon', null, '/', 'f1')->out(false);
$newcontact['profileimageurlsmall'] = moodle_url::make_webservice_pluginfile_url(
$usercontextid, 'user', 'icon', null, '/', 'f2')->out(false);
$allcontacts[$mode][$key] = $newcontact;
}
@@ -577,12 +576,11 @@ class core_message_external extends external_api {
$user->phone1 = null;
$user->phone2 = null;
// Try to get the user picture, but sometimes this method can return null.
$userdetails = user_get_user_details($user, null, array('profileimageurl', 'profileimageurlsmall'));
if (!empty($userdetails)) {
$newuser['profileimageurl'] = $userdetails['profileimageurl'];
$newuser['profileimageurlsmall'] = $userdetails['profileimageurlsmall'];
}
$usercontextid = context_user::instance($user->id)->id;
$newuser['profileimageurl'] = moodle_url::make_webservice_pluginfile_url(
$usercontextid, 'user', 'icon', null, '/', 'f1')->out(false);
$newuser['profileimageurlsmall'] = moodle_url::make_webservice_pluginfile_url(
$usercontextid, 'user', 'icon', null, '/', 'f2')->out(false);
$user = $newuser;
}