Merge pull request #23848 from nextcloud/backport/23839/stable18

MorrisJobke · web-flow · commit aeae6717579f · 2020-11-03T10:46:05.000+01:00
[stable18] No need to check if there is an avatar available, because it is gener…
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
@@ -108,7 +108,7 @@ public function __construct( $renderAs, $appId = '' ) {
 			if (\OC_User::getUser() === false) {
 				$this->assign('userAvatarSet', false);
 			} else {
-				$this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists());
+				$this->assign('userAvatarSet', true);
 				$this->assign('userAvatarVersion', $this->config->getUserValue(\OC_User::getUser(), 'avatar', 'version', 0));
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function __construct( $renderAs, $appId = '' ) {`
`108`	`108`	`if (\OC_User::getUser() === false) {`
`109`	`109`	`$this->assign('userAvatarSet', false);`
`110`	`110`	`} else {`
`111`		`- $this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists());`
	`111`	`+ $this->assign('userAvatarSet', true);`
`112`	`112`	`$this->assign('userAvatarVersion', $this->config->getUserValue(\OC_User::getUser(), 'avatar', 'version', 0));`
`113`	`113`	`}`
`114`	`114`