diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2019-10-01 12:17:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 12:17:35 +0200 |
| commit | 47ab961aa79f8b03cefe41ce000628e076cb2484 (patch) | |
| tree | d39c9e22b4483002d8ea735e43e01db345d80713 /lib | |
| parent | d68f30e72550ff2ce79e916142915c240458bbc5 (diff) | |
| parent | d33e0be2f1e2b276fc99b7f22cd5496cfc6c18a4 (diff) | |
| download | nextcloud-server-47ab961aa79f8b03cefe41ce000628e076cb2484.tar.gz nextcloud-server-47ab961aa79f8b03cefe41ce000628e076cb2484.zip | |
Merge pull request #17001 from nextcloud/fix/noid/addressbookchanges-avatar
reduce adressbook change events and handling
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Avatar/UserAvatar.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php index 2db65634e8c..f96ec93d5d0 100644 --- a/lib/private/Avatar/UserAvatar.php +++ b/lib/private/Avatar/UserAvatar.php @@ -97,7 +97,7 @@ class UserAvatar extends Avatar { $this->validateAvatar($img); - $this->remove(); + $this->remove(true); $type = $this->getAvatarImageType($img); $file = $this->folder->newFile('avatar.' . $type); $file->putContent($data); @@ -193,7 +193,7 @@ class UserAvatar extends Avatar { * @throws \OCP\Files\NotPermittedException * @throws \OCP\PreConditionNotMetException */ - public function remove() { + public function remove(bool $silent = false) { $avatars = $this->folder->getDirectoryListing(); $this->config->setUserValue($this->user->getUID(), 'avatar', 'version', @@ -203,7 +203,9 @@ class UserAvatar extends Avatar { $avatar->delete(); } $this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true'); - $this->user->triggerChange('avatar', ''); + if(!$silent) { + $this->user->triggerChange('avatar', ''); + } } /** |