Merge pull request #5394 from MrPetovan/bug/fix-config-set-return-value

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

diff --git a/src/Core/Config/JITConfigAdapter.php b/src/Core/Config/JITConfigAdapter.php
index 81a0c9890df3dd968636123e6756abe025b2ac7c..96e4305ea39e87f38c226b0930c543fa8cb139e1 100644 (file)
--- a/src/Core/Config/JITConfigAdapter.php
+++ b/src/Core/Config/JITConfigAdapter.php
@@ -66,11 +66,17 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
                        $this->in_db[$cat][$k] = true;
                        return $value;
                } elseif (isset($a->config[$cat][$k])) {
-                       // Assign the value (mostly) from the .htconfig.php to the cache
+                       // Assign the value (mostly) from config/local.ini.php file to the cache
                        $this->cache[$cat][$k] = $a->config[$cat][$k];
                        $this->in_db[$cat][$k] = false;
 
                        return $a->config[$cat][$k];
+               } elseif (isset($a->config[$k])) {
+                       // Assign the value (mostly) from config/local.ini.php file to the cache
+                       $this->cache[$k] = $a->config[$k];
+                       $this->in_db[$k] = false;
+
+                       return $a->config[$k];
                }
 
                $this->cache[$cat][$k] = '!<unset>!';