diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-08-03 13:21:11 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2015-08-03 13:21:11 +0200 |
| commit | c766284d522206578e7ec154961e0fce456f70c8 (patch) | |
| tree | a5246151bf8278a0e8053b9dd1ce9d770073c50b /inc/3rdparty/Session.class.php | |
| parent | c0cb52c07439c974075c302a190a034a8cce4f92 (diff) | |
| parent | e968ec6c2244aee600358b3c87648b2409c97945 (diff) | |
| download | wallabag-c766284d522206578e7ec154961e0fce456f70c8.tar.gz wallabag-c766284d522206578e7ec154961e0fce456f70c8.tar.zst wallabag-c766284d522206578e7ec154961e0fce456f70c8.zip | |
Merge pull request #1267 from wallabag/dev1.9.1
1.9.1
Diffstat (limited to 'inc/3rdparty/Session.class.php')
| -rw-r--r-- | inc/3rdparty/Session.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/3rdparty/Session.class.php b/inc/3rdparty/Session.class.php index b56e4c54..6ff73a76 100644 --- a/inc/3rdparty/Session.class.php +++ b/inc/3rdparty/Session.class.php | |||
| @@ -51,9 +51,9 @@ class Session | |||
| 51 | public static function init($longlastingsession = false) | 51 | public static function init($longlastingsession = false) |
| 52 | { | 52 | { |
| 53 | //check if session name is correct | 53 | //check if session name is correct |
| 54 | if ( (session_id() && !empty(self::$sessionName) && session_name()!=self::$sessionName) || $longlastingsession ) { | 54 | /*if ( (session_id() && !empty(self::$sessionName) && session_name()!=self::$sessionName) || $longlastingsession ) { |
| 55 | session_destroy(); | 55 | session_destroy(); |
| 56 | } | 56 | }*/ |
| 57 | 57 | ||
| 58 | // Force cookie path (but do not change lifetime) | 58 | // Force cookie path (but do not change lifetime) |
| 59 | $cookie = session_get_cookie_params(); | 59 | $cookie = session_get_cookie_params(); |