diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-01-10 11:00:47 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-01-10 11:00:47 +0100 |
| commit | 21a700bcf733d59105e3a23489762ac558dca19a (patch) | |
| tree | cf0826400bac9e9eff65c30b169259eee75ae0e5 /lib/base.php | |
| parent | 580deb09f867a9346a88226da66ba0d0cfaef574 (diff) | |
| parent | a58ca89e7f7076a1eba223c266ebc40dfdadd4b5 (diff) | |
| download | nextcloud-server-21a700bcf733d59105e3a23489762ac558dca19a.tar.gz nextcloud-server-21a700bcf733d59105e3a23489762ac558dca19a.zip | |
Merge pull request #21575 from owncloud/use-session-clear
Use ISession::clear
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/base.php b/lib/base.php index d6ef01ccbf7..71c04206f6a 100644 --- a/lib/base.php +++ b/lib/base.php @@ -450,11 +450,8 @@ class OC { if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) { if (isset($_COOKIE[session_name()])) { setcookie(session_name(), null, -1, self::$WEBROOT ? : '/'); - unset($_COOKIE[session_name()]); } - session_unset(); - session_destroy(); - session_start(); + $session->clear(); } $session->set('LAST_ACTIVITY', time()); |