From d25300043ca9a30c44f9aadc304b4671725a15f5 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 24 Jul 2014 16:44:42 -0400
Subject: [PATCH] #1741

---
 src/user/create.js | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/user/create.js b/src/user/create.js
index e4c1227266..b0d6850ea5 100644
--- a/src/user/create.js
+++ b/src/user/create.js
@@ -13,8 +13,6 @@ var async = require('async'),
 module.exports = function(User) {
 
 	User.create = function(userData, callback) {
-		var customFields = {};
-
 		userData = userData || {};
 		userData.userslug = utils.slugify(userData.username);
 
@@ -86,30 +84,20 @@ module.exports = function(User) {
 				}
 			},
 			customFields: function(next) {
-				plugins.fireHook('filter:user.custom_fields', userData, function(err, fields) {
-					if (err) {
-						return next(err);
-					}
-					delete fields.username;
-					delete fields.userslug;
-					customFields = fields;
-					next(err);
-				});
+				plugins.fireHook('filter:user.custom_fields', userData, next);
 			},
 			userData: function(next) {
-				plugins.fireHook('filter:user.create', userData, function(err, filteredUserData){
-					next(err, utils.merge(userData, filteredUserData));
-				});
+				plugins.fireHook('filter:user.create', userData, next);
 			}
 		}, function(err, results) {
 			if (err) {
 				return callback(err);
 			}
 
-			userData = results.userData;
+			userData = utils.merge(results.userData, results.customFields);
+
 			var userNameChanged = !!results.renamedUsername;
 
-			// If a new username was picked...
 			if (userNameChanged) {
 				userData.username = results.renamedUsername;
 				userData.userslug = utils.slugify(results.renamedUsername);
@@ -123,7 +111,7 @@ module.exports = function(User) {
 				var gravatar = User.createGravatarURLFromEmail(userData.email);
 				var timestamp = Date.now();
 
-				userData = {
+				userData = utils.merge({
 					'uid': uid,
 					'username': userData.username,
 					'userslug': userData.userslug,
@@ -143,9 +131,7 @@ module.exports = function(User) {
 					'lastposttime': 0,
 					'banned': 0,
 					'status': 'online'
-				};
-
-				userData = utils.merge(userData, customFields);
+				}, userData);
 
 				db.setObject('user:' + uid, userData, function(err) {
 					if(err) {