clear cookie before session clear

diff --git a/src/DI.php b/src/DI.php
index e328a1fdd36fd33ab66b3c9816b88010f54b2e91..485b1b799d6848e10f54aa669a5be63efc53807c 100644 (file)
--- 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 abe409ca1d3aa4c9f87a234e8c1852f794f9274a..cc236bf30411cb1d46543061b890c22ea4a5d5a3 100644 (file)
--- 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) {