Add search types

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 0f0c0537e4d98ae5538fda12993c2734c49e6d4f..2e357f8651a6e738aa31ab106429fcfcef6d96c6 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');
        }
 
        /**
@@ -1079,7 +1080,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();