From 127214230f05d9b024471cb612413c3edd7c7de0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A4r=20Halberkamp?= <fledaway@gmail.com>
Date: Fri, 19 Aug 2016 23:29:18 +0200
Subject: [PATCH] Update usergroup before merging connections This makes it so
 confirmed users that get their lock removed through changing to that account
 don't retain the lock symbol even though they're not locked

---
 users.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/users.js b/users.js
index 5f9bbe431f..23b76bcad3 100644
--- a/users.js
+++ b/users.js
@@ -710,8 +710,6 @@ class User {
 			// This user already exists; let's merge
 			user.merge(this);
 
-			user.updateGroup(registered);
-
 			Users.merge(user, this);
 			for (let i in this.prevNames) {
 				if (!user.prevNames[i]) {
@@ -790,6 +788,8 @@ class User {
 		if (oldUser.locked) this.locked = oldUser.locked;
 		if (oldUser.autoconfirmed) this.autoconfirmed = oldUser.autoconfirmed;
 
+		this.updateGroup(this.registered);
+
 		for (let i = 0; i < oldUser.connections.length; i++) {
 			this.mergeConnection(oldUser.connections[i]);
 		}