Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-21 16:00:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
barisusakli
2017-04-16 14:48:00 -04:00
parent c3ac7c31b1 65a65b19c0
commit 38e16ca8f6
5 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/webserver.js
View File

@@ -166,9 +166,7 @@ function setupFavicon(app) {
}
function setupCookie() {
var ttlDays = 1000 * 60 * 60 * 24 * (parseInt(meta.config.loginDays, 10) || 0);
var ttlSeconds = 1000 * (parseInt(meta.config.loginSeconds, 10) || 0);
var ttl = ttlSeconds || ttlDays || 1209600000; // Default to 14 days
var ttl = meta.getSessionTTLSeconds() * 1000;
var cookie = {
maxAge: ttl,