From a58ca89e7f7076a1eba223c266ebc40dfdadd4b5 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Sat, 9 Jan 2016 23:49:49 +0100
Subject: [PATCH] Use ISession::clear

The native approach using the PHP calls will not work properly with the cryptowrapper and thus this code is effectively doing nothing at the moment.
---
 lib/base.php | 5 +----
 1 file changed, 1 insertion(+), 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());
-- 
GitLab