Delete the cache entry allowing direct login again

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 01c585139238678a62c52f6ec4771fae3ae17929..b275d31add01f8c595fa362114472255e71638e1 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -1074,9 +1074,7 @@ class Profile
 
                // We need to extract the basebath from the profile url
                // to redirect the visitors '/magic' module.
-               // Note: We should have the basepath of a contact also in the contact table.
-               $urlarr = explode('/profile/', $contact['url']);
-               $basepath = $urlarr[0];
+               $basepath = Contact::getBasepath($contact['url']);
 
                if ($basepath != $a->getBaseURL() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) {
                        $magic_path = $basepath . '/magic' . '?f=&owa=1&dest=' . $dest;

diff --git a/src/Module/Logout.php b/src/Module/Logout.php
index 1f60e6dc191ceda75990d76dc5878d7182841c29..bf6a39e19f961a55a38a64b2e9d8ee5a4ecaa77c 100644 (file)
--- a/src/Module/Logout.php
+++ b/src/Module/Logout.php
@@ -7,6 +7,7 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Authentication;
+use Friendica\Core\Cache;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
@@ -27,6 +28,7 @@ class Logout extends BaseModule
                $visitor_home = null;
                if (remote_user()) {
                        $visitor_home = Profile::getMyURL();
+                       Cache::delete('zrlInit:' . $visitor_home);
                }
 
                Hook::callAll("logging_out");