Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-13 17:35:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master

Browse Source 
Conflicts:
	src/user.js
This commit is contained in:
Julian Lam
2014-01-23 08:15:16 -05:00
parent 4cfd970d5f 659817b4f1
commit f02cd9df82
8 changed files with 95 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/authentication.js
View File

@@ -197,7 +197,7 @@
return res.send(403);
}
user.create(req.body.username, req.body.password, req.body.email, function(err, uid) {
user.create({username: req.body.username, password: req.body.password, email: req.body.email, ip: req.ip}, function(err, uid) {
if (err === null && uid) {
req.login({
uid: uid