X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=f5626761e59d5ac8327e4d7fb6ada1395f1137a4;hb=585ba4c09fb1b019447d07bde4f867c76b793bda;hp=07e776745535f1b60039a71ca1f7270c9ca6f7a4;hpb=0848cef605bb6773852809a9cf3af5a5cc26bb10;p=friendica.git

diff --git a/src/App.php b/src/App.php
index 07e7767455..f5626761e5 100644
--- a/src/App.php
+++ b/src/App.php
@@ -9,6 +9,8 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use dba;
 
 use Detection\MobileDetect;
 
@@ -974,6 +976,10 @@ class App
 		if ($cat === 'config') {
 			$this->config[$k] = $value;
 		} else {
+			if (!isset($this->config[$cat])) {
+				$this->config[$cat] = [];
+			}
+
 			$this->config[$cat][$k] = $value;
 		}
 	}
@@ -1032,6 +1038,14 @@ class App
 		// Only arrays are serialized in database, so we have to unserialize sparingly
 		$value = is_string($v) && preg_match("|^a:[0-9]+:{.*}$|s", $v) ? unserialize($v) : $v;
 
+		if (!isset($this->config[$uid])) {
+			$this->config[$uid] = [];
+		}
+
+		if (!isset($this->config[$uid][$cat])) {
+			$this->config[$uid][$cat] = [];
+		}
+
 		$this->config[$uid][$cat][$k] = $value;
 	}
 
@@ -1091,10 +1105,15 @@ class App
 	 */
 	public function getCurrentTheme()
 	{
-		if (!$this->current_theme) {
-			$this->computeCurrentTheme();
+		if ($this->mode == App::MODE_INSTALL) {
+			return '';
 		}
 
+		//// @TODO Compute the current theme only once (this behavior has
+		/// already been implemented, but it didn't work well -
+		/// https://github.com/friendica/friendica/issues/5092)
+		$this->computeCurrentTheme();
+
 		return $this->current_theme;
 	}