DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avatar quickfix

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-09-16 16:34:07 +03:00
parent f1e118e36a
commit f3bd8aabc9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ajax/otpoll.php
View File

@ -54,17 +54,17 @@ try{
$x['display_name'] = \OCP\User::getDisplayName($x['uid']); $x['display_name'] = \OCP\User::getDisplayName($x['uid']);
// Do we have OC_Avatar in out disposal? // Do we have OC_Avatar in out disposal?
if (!method_exists('\OCP\Avatar', 'get') || \OC_Config::getValue('enable_avatars', true) !== true){ if (!class_exists('\OC_Avatar') || \OC_Config::getValue('enable_avatars', true) !== true){
$x['avatar_url'] = \OCP\Util::linkToRoute('documents_user_avatar'); $x['avatar_url'] = \OCP\Util::linkToRoute('documents_user_avatar');
} else { } else {
$avatar = new \OC_Avatar(); $avatar = new \OC_Avatar($x['uid']);
$image = $avatar->get($x['uid'], 64); $image = $avatar->get(64);
// User has an avatar // User has an avatar
if ($image instanceof \OC_Image) { if ($image instanceof \OC_Image) {
$x['avatar_url'] = \OC_Helper::linkToRoute( $x['avatar_url'] = \OC_Helper::linkToRoute(
'core_avatar_get', 'core_avatar_get',
array( 'user' => $x['uid'], 'size' => 64) array( 'user' => $x['uid'], 'size' => 64)
); ) . '?requesttoken=' . \OC::$session->get('requesttoken');
} else { } else {
//shortcircuit if it's not an image //shortcircuit if it's not an image
$x['avatar_url'] = \OCP\Util::linkToRoute('documents_user_avatar'); $x['avatar_url'] = \OCP\Util::linkToRoute('documents_user_avatar');