Merge branch 'master' of github.com:designcreateplay/NodeBB

public/src/forum/login.js

@@ -28,10 +28,16 @@ define(function() {
 							app.previousUrl = '/';
 						}
 
-						if(app.previousUrl.indexOf('/reset/') != -1)
+						if(app.previousUrl.indexOf('/reset/') !== -1) {
 							window.location.replace(RELATIVE_PATH + "/?loggedin");
-						else
+						} else {
+							var index = app.previousUrl.indexOf('#');
+							if(index !== -1) {
+								window.location.replace(app.previousUrl.slice(0, index) + '?loggedin' + app.previousUrl.slice(index));
+							} else {
 								window.location.replace(app.previousUrl + "?loggedin");
+							}
+						}
 
 						app.loadConfig();
 					}

src/user.js

@@ -108,8 +108,11 @@ var bcrypt = require('bcryptjs'),
 					'showemail': 0
 				};
 
-				db.setObject('user:' + uid, userData);
+				db.setObject('user:' + uid, userData, function(err) {
 
+					if(err) {
+						return callback(err);
+					}
 					db.setObjectField('username:uid', userData.username, uid);
 					db.setObjectField('userslug:uid', userData.userslug, uid);
 
@@ -143,6 +146,7 @@ var bcrypt = require('bcryptjs'),
 					}
 				});
 			});
+		});
 	};
 
 	User.ban = function(uid, callback) {