Merge remote-tracking branch 'upstream/2019.06-rc' into issue-6477

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 0f0c0537e4d98ae5538fda12993c2734c49e6d4f..89d3009da04d4f72ca2afffe4e5d9d38ac24461a 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -149,7 +149,8 @@ class App
         */
        public function getBasePath()
        {
-               return $this->config->get('system', 'basepath');
+               // Don't use the basepath of the config table for basepath (it should always be the config-file one)
+               return $this->config->getCache()->get('system', 'basepath');
        }
 
        /**
@@ -992,12 +993,6 @@ class App
                        );
                }
 
-               if (strstr($this->query_string, '.well-known/host-meta') && ($this->query_string != '.well-known/host-meta')) {
-                       Module\Special\HTTPException::rawContent(
-                               new HTTPException\NotFoundException()
-                       );
-               }
-
                if (!$this->getMode()->isInstall()) {
                        // Force SSL redirection
                        if ($this->baseURL->checkRedirectHttps()) {
@@ -1079,7 +1074,7 @@ class App
                // but we need "view" module for stylesheet
                if ($this->getMode()->isInstall() && $this->module !== 'install') {
                        $this->internalRedirect('install');
-               } elseif (!$this->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $this->module !== 'maintenance') {
+               } elseif (!$this->getMode()->isInstall() && !$this->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $this->module !== 'maintenance') {
                        $this->internalRedirect('maintenance');
                } else {
                        $this->checkURL();
@@ -1103,7 +1098,7 @@ class App
 
                // Compatibility with the Android Diaspora client
                if ($this->module == 'stream') {
-                       $this->internalRedirect('network?f=&order=post');
+                       $this->internalRedirect('network?order=post');
                }
 
                if ($this->module == 'conversations') {
@@ -1111,15 +1106,15 @@ class App
                }
 
                if ($this->module == 'commented') {
-                       $this->internalRedirect('network?f=&order=comment');
+                       $this->internalRedirect('network?order=comment');
                }
 
                if ($this->module == 'liked') {
-                       $this->internalRedirect('network?f=&order=comment');
+                       $this->internalRedirect('network?order=comment');
                }
 
                if ($this->module == 'activity') {
-                       $this->internalRedirect('network/?f=&conv=1');
+                       $this->internalRedirect('network?conv=1');
                }
 
                if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) {