From ba6af71150ad8c8192f144f85c688f2f67bd0019 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 5 Feb 2015 23:37:11 -0500
Subject: [PATCH] fix profile update

---
 src/socket.io/user.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/socket.io/user.js b/src/socket.io/user.js
index d879813bae..b1e1512526 100644
--- a/src/socket.io/user.js
+++ b/src/socket.io/user.js
@@ -168,6 +168,7 @@ SocketUser.updateProfile = function(socket, data, callback) {
 					newUsername: userData.username
 				});
 			}
+			callback(null, userData);
 		}
 
 		if (socket.uid === parseInt(data.uid, 10)) {
@@ -175,12 +176,8 @@ SocketUser.updateProfile = function(socket, data, callback) {
 		}
 
 		user.isAdministrator(socket.uid, function(err, isAdmin) {
-			if (err) {
-				return callback(err);
-			}
-
-			if (!isAdmin) {
-				return callback(new Error('[[error:no-privileges]]'));
+			if (err || !isAdmin) {
+				return callback(err || new Error('[[error:no-privileges]]'));
 			}
 
 			user.updateProfile(data.uid, data, done);