From 20f1ab05e64af8f968d9bce87e5fcb963d5a4d2c Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin@philipp.info>
Date: Tue, 7 Jan 2020 00:10:15 +0100
Subject: [PATCH 1/2] clear cookie before session clear

---
 src/DI.php                     | 2 ++
 src/Module/Security/Logout.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/DI.php b/src/DI.php
index e328a1fdd3..485b1b799d 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -28,6 +28,7 @@ use Psr\Log\LoggerInterface;
  * @method static Core\Process process()
  * @method static Core\Session\ISession session()
  * @method static Database\Database dba()
+ * @method static Model\User\Cookie cookie()
  * @method static Model\Notify notify()
  * @method static Model\Introduction intro()
  * @method static Protocol\Activity activity()
@@ -61,6 +62,7 @@ abstract class DI
 		'process'      => Core\Process::class,
 		'session'      => Core\Session\ISession::class,
 		'dba'          => Database\Database::class,
+		'cookie'       => Model\User\Cookie::class,
 		'notify'       => Model\Notify::class,
 		'intro'        => Model\Introduction::class,
 		'activity'     => Protocol\Activity::class,
diff --git a/src/Module/Security/Logout.php b/src/Module/Security/Logout.php
index abe409ca1d..cc236bf304 100644
--- a/src/Module/Security/Logout.php
+++ b/src/Module/Security/Logout.php
@@ -6,7 +6,6 @@
 namespace Friendica\Module\Security;
 
 use Friendica\BaseModule;
-use Friendica\App\Authentication;
 use Friendica\Core\Cache;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -34,6 +33,7 @@ class Logout extends BaseModule
 		}
 
 		Hook::callAll("logging_out");
+		DI::cookie()->clear();
 		Session::clear();
 
 		if ($visitor_home) {

From c7476513e30baccc6649979b68fb9ada22818a91 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin@philipp.info>
Date: Tue, 7 Jan 2020 00:14:01 +0100
Subject: [PATCH 2/2] removed some static wrapper

---
 src/Module/Security/Logout.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Module/Security/Logout.php b/src/Module/Security/Logout.php
index cc236bf304..3cbbd4933f 100644
--- a/src/Module/Security/Logout.php
+++ b/src/Module/Security/Logout.php
@@ -6,10 +6,7 @@
 namespace Friendica\Module\Security;
 
 use Friendica\BaseModule;
-use Friendica\Core\Cache;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Profile;
@@ -29,17 +26,17 @@ class Logout extends BaseModule
 		$visitor_home = null;
 		if (remote_user()) {
 			$visitor_home = Profile::getMyURL();
-			Cache::delete('zrlInit:' . $visitor_home);
+			DI::cache()->delete('zrlInit:' . $visitor_home);
 		}
 
 		Hook::callAll("logging_out");
 		DI::cookie()->clear();
-		Session::clear();
+		DI::session()->clear();
 
 		if ($visitor_home) {
 			System::externalRedirect($visitor_home);
 		} else {
-			info(L10n::t('Logged out.'));
+			info(DI::l10n()->t('Logged out.'));
 			DI::baseUrl()->redirect();
 		}
 	}