X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=2e357f8651a6e738aa31ab106429fcfcef6d96c6;hb=58c8959da0ece9a23966b315310a3962542bc7f4;hp=017661c4ca666081ad997b5e5d97ad7ce3ed4d08;hpb=c9cce8492e5b2607b2a092474d1de4d188b7a2c9;p=friendica.git

diff --git a/src/App.php b/src/App.php
index 017661c4ca..2e357f8651 100644
--- 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');
 	}
 
 	/**
@@ -988,7 +989,7 @@ class App
 			header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string);
 
 			Module\Special\HTTPException::rawContent(
-				new HTTPException\ServiceUnavaiableException('The node is currently overloaded. Please try again later.')
+				new HTTPException\ServiceUnavailableException('The node is currently overloaded. Please try again later.')
 			);
 		}
 
@@ -1077,10 +1078,10 @@ class App
 
 		// in install mode, any url loads install module
 		// but we need "view" module for stylesheet
-		if ($this->getMode()->isInstall() && $this->module != 'view') {
-			$this->module = 'install';
-		} elseif (!$this->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $this->module != 'view') {
-			$this->module = 'maintenance';
+		if ($this->getMode()->isInstall() && $this->module !== 'install') {
+			$this->internalRedirect('install');
+		} elseif (!$this->getMode()->isInstall() && !$this->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $this->module !== 'maintenance') {
+			$this->internalRedirect('maintenance');
 		} else {
 			$this->checkURL();
 			Core\Update::check($this->getBasePath(), false, $this->getMode());