returns non lazy value while searching for lazy

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php
index 07eebf1d047d6864fbfc6d606d0a1b4f1d089db7..60b0e77f7af9f3d84534ff606987ca6cb36b283e 100644 (file)
--- a/lib/private/AppConfig.php
+++ b/lib/private/AppConfig.php
@@ -462,11 +462,14 @@ class AppConfig implements IAppConfig {
                        throw new AppConfigTypeConflictException('conflict with value type from database');
                }
 
-               if ($lazy) {
-                       return $this->lazyCache[$app][$key] ?? $default;
-               }
-
-               return $this->fastCache[$app][$key] ?? $default;
+               /**
+                * - the pair $app/$key cannot exist in both array,
+                * - we should still returns an existing non-lazy value even if current method
+                *   is called with $lazy is true
+                *
+                * This way, lazyCache will be empty until the load for lazy config value is requested.
+                */
+               return $this->lazyCache[$app][$key] ?? $this->fastCache[$app][$key] ?? $default;
        }
 
        /**