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

src/routes/authentication.js

@@ -65,8 +65,23 @@
 			return res.send(403);
 		}
 
-		user.create({username: req.body.username, password: req.body.password, email: req.body.email, ip: req.ip}, function(err, uid) {
+		var userData = {
-			if (err === null && uid) {
+			username: req.body.username,
+			password: req.body.password,
+			email: req.body.email,
+			ip: req.ip
+		};
+
+		plugins.fireHook('filter:register.check', userData, function(err, userData) {
+			if (err) {
+				return res.redirect(nconf.get('relative_path') + '/register');
+			}
+
+			user.create(userData, function(err, uid) {
+				if (err || !uid) {
+					return res.redirect(nconf.get('relative_path') + '/register');
+				}
+
 				req.login({
 					uid: uid
 				}, function() {
@@ -79,9 +94,7 @@
 						res.redirect(nconf.get('relative_path') + '/');
 					}
 				});
-			} else {
+			});
-				res.redirect(nconf.get('relative_path') + '/register');
-			}
 		});
 	}