Merge branch 'master' into develop

[friendica.git] / src / Core / Config / Configuration.php

diff --git a/src/Core/Config/Configuration.php b/src/Core/Config/Configuration.php
index 2ac0da0ad1b967b0d580f1f559b2d971f3f055e7..18191d0429c45bfd2fb5fc9f860fb71eaca2b008 100644 (file)
--- 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;
        }
 
        /**