Merge pull request #6678 from rabuzarus/20190217_-_fix_magicLinks_mentions

[friendica.git] / src / Core / Config / Adapter / PreloadConfigAdapter.php

diff --git a/src/Core/Config/Adapter/PreloadConfigAdapter.php b/src/Core/Config/Adapter/PreloadConfigAdapter.php
index 8cad5c5557441d8dc932b615ad6d283bd4eb8577..fa691a16d353443ce1630204ab04607807909bd7 100644 (file)
--- a/src/Core/Config/Adapter/PreloadConfigAdapter.php
+++ b/src/Core/Config/Adapter/PreloadConfigAdapter.php
@@ -32,13 +32,13 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 
                $configs = DBA::select('config', ['cat', 'v', 'k']);
                while ($config = DBA::fetch($configs)) {
-                       $return[$config['k']] = $config['v'];
+                       $return[$config['cat']][$config['k']] = $config['v'];
                }
                DBA::close($configs);
 
                $this->config_loaded = true;
 
-               return [$cat => $return];
+               return $return;
        }
 
        /**
@@ -47,7 +47,7 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
        public function get($cat, $key)
        {
                if (!$this->isConnected()) {
-                       return null;
+                       return '!<unset>!';
                }
 
                $config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
@@ -101,4 +101,16 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
 
                return $result;
        }
+
+       /**
+        * {@inheritdoc}
+        */
+       public function isLoaded($cat, $key)
+       {
+               if (!$this->isConnected()) {
+                       return false;
+               }
+
+               return $this->config_loaded;
+       }
 }