Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always set the generated flag to false when an avatar is being set #18505

Merged
merged 1 commit into from
Dec 22, 2019
Merged

Always set the generated flag to false when an avatar is being set #18505

merged 1 commit into from
Dec 22, 2019

Conversation

nickvergessen
Copy link
Member

Fix #18481

@nickvergessen nickvergessen added this to the Nextcloud 18 milestone Dec 20, 2019
@nickvergessen nickvergessen force-pushed the bugfix/18481/avatars-always-return-201-status-code branch from 8a4f14e to 9f3df9a Compare December 20, 2019 14:05
@nickvergessen
Always set the generated flag to false when an avatar is being set
e37af2d 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the bugfix/18481/avatars-always-return-201-status-code branch from 9f3df9a to e37af2d Compare December 20, 2019 14:34
@kesselb
Copy link
Contributor

kesselb commented Dec 20, 2019

I still wonder where the generated file is deleted. But this pr fixes another issue. If the flag generated is true the delete button for an avatar is missing.

@kesselb
Copy link
Contributor

kesselb commented Dec 20, 2019

I still wonder where the generated file is deleted.

server/lib/private/Avatar/UserAvatar.php

Line 104 in 5bf3d1b

$this->remove(true);

Found it. It's probably safe to remove the other remove statement with the try-catch around. But there is no lock for the folder so another process could create a new generated avatar in the meantime. I don't know ;)

@nickvergessen
Copy link
Member Author

Yeah I gues that is exactly the issue.

@rullzer rullzer merged commit 3af63f1 into master Dec 22, 2019
@rullzer rullzer deleted the bugfix/18481/avatars-always-return-201-status-code branch December 22, 2019 13:26
@rullzer rullzer mentioned this pull request Dec 23, 2019
Merged
18 tasks
@kesselb kesselb mentioned this pull request Dec 24, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kesselb kesselb kesselb approved these changes

@rullzer rullzer rullzer approved these changes

@mario mario Awaiting requested review from mario

@tobiasKaminsky tobiasKaminsky Awaiting requested review from tobiasKaminsky

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug regression
Projects
None yet
Milestone
Nextcloud 18.0.0
Development

Successfully merging this pull request may close these issues.

Avatar endpoint returns wrong response code
3 participants
@nickvergessen @kesselb @rullzer