Merge pull request #8027 from nupplaphil/task/session_remove_cookie

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 243f5ba07586a123c236813a0584ce481cb16b13..3325f5b260357694b0bc81d590cd48abe31788d3 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -8,7 +8,7 @@ use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\App\Page;
-use Friendica\Core\Authentication;
+use Friendica\App\Authentication;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Core\Config\Configuration;
 use Friendica\Core\Config\PConfiguration;
@@ -385,7 +385,7 @@ class App
         * @deprecated 2019.09 - Use BaseURL->remove() instead
         * @see        BaseURL::remove()
         */
-       public function removeBaseURL($origURL)
+       public function removeBaseURL(string $origURL)
        {
                return $this->baseURL->remove($origURL);
        }
@@ -670,19 +670,11 @@ class App
                                        System::externalRedirect($this->baseURL->get() . '/' . $this->args->getQueryString());
                                }
 
-                               Core\Session::init();
                                Core\Hook::callAll('init_1');
                        }
 
                        // Exclude the backend processes from the session management
-                       if (!$this->mode->isBackend()) {
-                               $stamp1 = microtime(true);
-                               session_start();
-                               $this->profiler->saveTimestamp($stamp1, 'parser', Core\System::callstack());
-                               $this->l10n->setSessionVariable();
-                               $this->l10n->setLangFromSession();
-                       } else {
-                               $_SESSION = [];
+                       if ($this->mode->isBackend()) {
                                Core\Worker::executeIfIdle();
                        }
 
@@ -720,7 +712,7 @@ class App
                                Model\Profile::openWebAuthInit($token);
                        }
 
-                       $auth->withSession($this, $_COOKIE);
+                       $auth->withSession($this);
 
                        if (empty($_SESSION['authenticated'])) {
                                header('X-Account-Management-Status: none');