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

src/routes/authentication.js

@@ -113,6 +113,14 @@
 							message: info.message
 						});
 					}
+
+					// Alter user cookie depending on passed-in option
+					if (req.body.remember === 'true') {
+						req.session.cookie.maxAge = 60*60*24*parseInt(meta.configs.loginDays || 14, 10);
+					} else {
+						req.session.cookie.expires = false;
+					}
+
 					req.login({
 						uid: user.uid
 					}, function() {