From e956c195878f2408f50f04c1516c66006a3b44ce Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 5 Mar 2014 21:21:53 -0500
Subject: [PATCH] #1110 - moved isEmailAvailable into User.email

---
 src/user.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/user.js b/src/user.js
index 29065c7577..4674e1d17b 100644
--- a/src/user.js
+++ b/src/user.js
@@ -58,7 +58,7 @@ var bcrypt = require('bcryptjs'),
 			},
 			function(next) {
 				if (userData.email) {
-					User.isEmailAvailable(userData.email, function(err, available) {
+					User.email.available(userData.email, function(err, available) {
 						if (err) {
 							return next(err);
 						}
@@ -278,7 +278,7 @@ var bcrypt = require('bcryptjs'),
 					return next(null, true);
 				}
 
-				User.isEmailAvailable(data.email, function(err, available) {
+				User.email.available(data.email, function(err, available) {
 					if (err) {
 						return next(err, null);
 					}
@@ -422,12 +422,6 @@ var bcrypt = require('bcryptjs'),
 		});
 	};
 
-	User.isEmailAvailable = function(email, callback) {
-		db.isObjectField('email:uid', email, function(err, exists) {
-			callback(err, !exists);
-		});
-	};
-
 	User.changePassword = function(uid, data, callback) {
 		if(!data || !data.uid) {
 			return callback(new Error('invalid-uid'));
@@ -1029,6 +1023,11 @@ var bcrypt = require('bcryptjs'),
 					});
 				}
 			});
+		},
+		available: function(email, callback) {
+			db.isObjectField('email:uid', email, function(err, exists) {
+				callback(err, !exists);
+			});
 		}
 	};