From 38f8f7cbf4dbfecdb55be8bfcafa4d8b5c7355d4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 9 Apr 2019 11:23:06 +0200
Subject: [PATCH] Don't get the avatar when we don't operate anyway
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
lib/private/Avatar/UserAvatar.php | 5 -----
lib/private/Server.php | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php
index db5e041d66c..2db65634e8c 100644
--- a/lib/private/Avatar/UserAvatar.php
+++ b/lib/private/Avatar/UserAvatar.php
@@ -312,11 +312,6 @@ class UserAvatar extends Avatar {
* @throws \OCP\PreConditionNotMetException
*/
public function userChanged($feature, $oldValue, $newValue) {
- // We only change the avatar on display name changes
- if ($feature !== 'displayName') {
- return;
- }
-
// If the avatar is not generated (so an uploaded image) we skip this
if (!$this->folder->fileExists('generated')) {
return;
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 6507f58f896..936ce21fa62 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -1257,6 +1257,11 @@ class Server extends ServerContainer implements IServerContainer {
$oldValue = $e->getArgument('oldValue');
$value = $e->getArgument('value');
+ // We only change the avatar on display name changes
+ if ($feature !== 'displayName') {
+ return;
+ }
+
try {
$avatar = $manager->getAvatar($user->getUID());
$avatar->userChanged($feature, $oldValue, $value);
--
GitLab