diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-03-21 14:05:51 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-03-21 14:05:51 +0100 |
commit | 028e34b6c40c3571d35c49d5a27b7eac19ceb4ef (patch) | |
tree | c7d415ade8f1ce1d80408fb465bdb68f93886b71 /index.php | |
parent | 0c51bfea6fce1b1a6d8b54304b0dba673c1fbd20 (diff) | |
parent | ad53faf25cc2f83594f3f756923a042351f4f202 (diff) | |
download | wallabag-028e34b6c40c3571d35c49d5a27b7eac19ceb4ef.tar.gz wallabag-028e34b6c40c3571d35c49d5a27b7eac19ceb4ef.tar.zst wallabag-028e34b6c40c3571d35c49d5a27b7eac19ceb4ef.zip |
Merge pull request #581 from mariroz/fix-session-livetime
fix of issue under nginx and php-fpm
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -14,9 +14,7 @@ require_once 'inc/poche/global.inc.php'; | |||
14 | 14 | ||
15 | # Start session | 15 | # Start session |
16 | Session::$sessionName = 'poche'; | 16 | Session::$sessionName = 'poche'; |
17 | if ( !isset($_GET['login']) ) { | 17 | Session::init(); |
18 | Session::init(); | ||
19 | } | ||
20 | 18 | ||
21 | # Start Poche | 19 | # Start Poche |
22 | $poche = new Poche(); | 20 | $poche = new Poche(); |
@@ -122,6 +120,7 @@ if (Session::isLogged()) { | |||
122 | } else { | 120 | } else { |
123 | $tpl_file = Tools::getTplFile('login'); | 121 | $tpl_file = Tools::getTplFile('login'); |
124 | $tpl_vars['http_auth'] = 0; | 122 | $tpl_vars['http_auth'] = 0; |
123 | Session::logout(); | ||
125 | } | 124 | } |
126 | 125 | ||
127 | # because messages can be added in $poche->action(), we have to add this entry now (we can add it before) | 126 | # because messages can be added in $poche->action(), we have to add this entry now (we can add it before) |