X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConfig%2FConfiguration.php;h=18191d0429c45bfd2fb5fc9f860fb71eaca2b008;hb=b56709d802e68175d1551071b295ecd15c0857ab;hp=2ac0da0ad1b967b0d580f1f559b2d971f3f055e7;hpb=d6944eb894df3f245e2a5bb691da2f9b306e253a;p=friendica.git

diff --git a/src/Core/Config/Configuration.php b/src/Core/Config/Configuration.php
index 2ac0da0ad1..18191d0429 100644
--- a/src/Core/Config/Configuration.php
+++ b/src/Core/Config/Configuration.php
@@ -83,20 +83,19 @@ class Configuration
 		if ($this->configAdapter->isConnected() &&
 			(!$this->configAdapter->isLoaded($cat, $key) ||
 			$refresh)) {
+
 			$dbvalue = $this->configAdapter->get($cat, $key);
 
-			if ($dbvalue !== '!<unset>!') {
+			if (isset($dbvalue)) {
 				$this->configCache->set($cat, $key, $dbvalue);
-				return $dbvalue;
+				unset($dbvalue);
 			}
 		}
 
 		// use the config cache for return
-		if ($this->configCache->has($cat, $key)) {
-			return $this->configCache->get($cat, $key);
-		} else {
-			return $default_value;
-		}
+		$result = $this->configCache->get($cat, $key);
+
+		return (isset($result)) ? $result : $default_value;
 	}
 
 	/**