[stable27] fix: Fix avatar imagestags/v27.1.9rc1
@@ -101,6 +101,9 @@ class AvatarManager implements IAvatarManager { | |||
/** | |||
* return a user specific instance of \OCP\IAvatar | |||
* | |||
* If the user is disabled a guest avatar will be returned | |||
* | |||
* @see \OCP\IAvatar | |||
* @param string $userId the ownCloud user id | |||
* @return \OCP\IAvatar | |||
@@ -113,6 +116,10 @@ class AvatarManager implements IAvatarManager { | |||
throw new \Exception('user does not exist'); | |||
} | |||
if (!$user->isEnabled()) { | |||
return $this->getGuestAvatar($userId); | |||
} | |||
// sanitize userID - fixes casing issue (needed for the filesystem stuff that is done below) | |||
$userId = $user->getUID(); | |||
@@ -108,6 +108,11 @@ class AvatarManagerTest extends \Test\TestCase { | |||
->method('getUID') | |||
->willReturn('valid-user'); | |||
$user | |||
->expects($this->any()) | |||
->method('isEnabled') | |||
->willReturn(true); | |||
// requesting user | |||
$this->userSession->expects($this->once()) | |||
->method('getUser') | |||
@@ -162,6 +167,11 @@ class AvatarManagerTest extends \Test\TestCase { | |||
->method('getUID') | |||
->willReturn('valid-user'); | |||
$user | |||
->expects($this->any()) | |||
->method('isEnabled') | |||
->willReturn(true); | |||
$this->userSession->expects($this->once()) | |||
->method('getUser') | |||
->willReturn($user); | |||
@@ -231,6 +241,12 @@ class AvatarManagerTest extends \Test\TestCase { | |||
->expects($this->once()) | |||
->method('getUID') | |||
->willReturn('valid-user'); | |||
$user | |||
->expects($this->any()) | |||
->method('isEnabled') | |||
->willReturn(true); | |||
$this->userManager | |||
->expects($this->once()) | |||
->method('get') |