Check if avatar support is enabled

This commit is contained in:
Victor Dubiniuk 2013-09-05 23:05:07 +03:00
parent 3ca80b4933
commit de08e8ced6

View File

@ -53,11 +53,13 @@ try{
function($x){ function($x){
$x['display_name'] = \OCP\User::getDisplayName($x['uid']); $x['display_name'] = \OCP\User::getDisplayName($x['uid']);
if (!method_exists('\OCP\Avatar', 'get')){ // Do we have OC_Avatar in out disposal?
if (!method_exists('\OCP\Avatar', 'get') || \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();
$image = $avatar->get($x['uid'], 64); $image = $avatar->get($x['uid'], 64);
// 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',