Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into user-icons

Browse Source 
Conflicts:
	public/src/app.js
	public/src/client/account/edit.js
This commit is contained in:
Julian Lam
2015-10-07 02:14:03 -04:00
parent 896abb59d3 8b3f1684f7
commit 4c96f95330
180 changed files with 1034 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/user.js
View File

@@ -150,11 +150,15 @@ var async = require('async'),
Password.hash(nconf.get('bcrypt_rounds') || 12, password, callback);
};
User.exists = function(userslug, callback) {
User.exists = function(uid, callback) {
db.isSortedSetMember('users:joindate', uid, callback);
};
User.existsBySlug = function(userslug, callback) {
User.getUidByUserslug(userslug, function(err, exists) {
callback(err, !! exists);
});
};
}
User.getUidByUsername = function(username, callback) {
if (!username) {