Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-19 23:50:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-03-29 15:26:49 -04:00
parent 55f07d3301 a450cb869d
commit 7afe8a32f6
269 changed files with 883 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/user/create.js
View File

@@ -28,10 +28,10 @@ module.exports = function (User) {
email: data.email || '',
joindate: timestamp,
lastonline: timestamp,
picture: '',
picture: data.picture || '',
fullname: data.fullname || '',
location: '',
birthday: '',
location: data.location || '',
birthday: data.birthday || '',
website: '',
signature: '',
uploadedpicture: '',
@@ -210,8 +210,7 @@ module.exports = function (User) {
function go() {
var username = userData.username + ' ' + num.toString(32);
var userslug = utils.slugify(username);
meta.userOrGroupExists(userslug, function (err, exists) {
meta.userOrGroupExists(username, function (err, exists) {
if (err || !exists) {
return callback(err, username);
}