From 14b03c7137afd449059ae57d378922f4cbf0eb4e Mon Sep 17 00:00:00 2001
From: Diogo Peralta Cordeiro <mail@diogo.site>
Date: Wed, 12 Jan 2022 17:46:13 +0000
Subject: [PATCH] [UI][UserPanel] Do not try to re-set an unchanged nickname

---
 src/Util/Form/ActorForms.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Util/Form/ActorForms.php b/src/Util/Form/ActorForms.php
index 3f1d724c0f..bc25b80916 100644
--- a/src/Util/Form/ActorForms.php
+++ b/src/Util/Form/ActorForms.php
@@ -81,7 +81,9 @@ class ActorForms
 
         // Setting nickname normalised and setting actor cache
         $extra_step = function ($data, $extra_args) use ($user, $target) {
-            $user->setNicknameSanitizedAndCached($data['nickname']);
+            if ($user->getNickname() !== $data['nickname']) {
+                $user->setNicknameSanitizedAndCached($data['nickname']);
+            }
 
             $cache_keys = Actor::cacheKeys($target->getId());
             foreach (['id', 'nickname', 'fullname'] as $key) {