aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Avatar
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-12-22 14:26:23 +0100
committerGitHub <noreply@github.com>2019-12-22 14:26:23 +0100
commit3af63f1593b94c811fbefea6ccfba379c71ef957 (patch)
tree71cf46bbd41074a08fde5a32402e826c38bdd6de /lib/private/Avatar
parentc81e05db98c6bc0b6107d3666f38adab33b70a48 (diff)
parente37af2d81c2d0ab732d52e865ef53254cc73e086 (diff)
downloadnextcloud-server-3af63f1593b94c811fbefea6ccfba379c71ef957.tar.gz
nextcloud-server-3af63f1593b94c811fbefea6ccfba379c71ef957.zip
Merge pull request #18505 from nextcloud/bugfix/18481/avatars-always-return-201-status-code
Always set the generated flag to false when an avatar is being set
Diffstat (limited to 'lib/private/Avatar')
-rw-r--r--lib/private/Avatar/UserAvatar.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php
index 220077c32f5..8e2a7475bb9 100644
--- a/lib/private/Avatar/UserAvatar.php
+++ b/lib/private/Avatar/UserAvatar.php
@@ -108,12 +108,12 @@ class UserAvatar extends Avatar {
try {
$generated = $this->folder->getFile('generated');
- $this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'false');
$generated->delete();
} catch (NotFoundException $e) {
//
}
+ $this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'false');
$this->user->triggerChange('avatar', $file);
}