X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FMagic.php;h=c300e5971e4bddd4f0d550d443d906ec78c47f7d;hb=9115ec5f0deb71111d53a1eda0c1de7c4d8c6c53;hp=42eae695e15dc810106776b0bab186b1edc1f593;hpb=d2da2492b76fbc77ad11c8a5482e2674381b2af0;p=friendica.git

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 42eae695e1..c300e5971e 100644
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -24,7 +24,7 @@ namespace Friendica\Module;
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
-use Friendica\Core\Session;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Model\Contact;
@@ -50,14 +50,17 @@ class Magic extends BaseModule
 	protected $dba;
 	/** @var ICanSendHttpRequests */
 	protected $httpClient;
+	/** @var IHandleUserSessions */
+	protected $userSession;
 
-	public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Database $dba, ICanSendHttpRequests $httpClient, array $server, array $parameters = [])
+	public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Database $dba, ICanSendHttpRequests $httpClient, IHandleUserSessions $userSession, $server, array $parameters = [])
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-		$this->app        = $app;
-		$this->dba        = $dba;
-		$this->httpClient = $httpClient;
+		$this->app         = $app;
+		$this->dba         = $dba;
+		$this->httpClient  = $httpClient;
+		$this->userSession = $userSession;
 	}
 
 	protected function rawContent(array $request = [])
@@ -91,8 +94,8 @@ class Magic extends BaseModule
 		}
 
 		// OpenWebAuth
-		if (Session::getLocalUser() && $owa) {
-			$user = User::getById(Session::getLocalUser());
+		if ($this->userSession->getLocalUserId() && $owa) {
+			$user = User::getById($this->userSession->getLocalUserId());
 
 			// Extract the basepath
 			// NOTE: we need another solution because this does only work