Browse Source

Do not try to get the avatar if there is no user

tags/v9.0beta1
Roeland Jago Douma 8 years ago
parent
commit
db95c8d512
1 changed files with 7 additions and 1 deletions
  1. 7
    1
      lib/private/templatelayout.php

+ 7
- 1
lib/private/templatelayout.php View File

@@ -136,7 +136,13 @@ class OC_TemplateLayout extends OC_Template {
$this->assign('user_uid', OC_User::getUser());
$this->assign('appsmanagement_active', $appsMgmtActive);
$this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true));
$this->assign('userAvatarSet', \OC_Helper::userAvatarSet(OC_User::getUser()));

if (OC_User::getUser() === false) {
$this->assign('userAvatarSet', false);
} else {
$this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(OC_User::getUser())->exists());
}

} else if ($renderAs == 'error') {
parent::__construct('core', 'layout.guest', '', false);
$this->assign('bodyid', 'body-login');

Loading…
Cancel
Save