diff options
| -rw-r--r-- | lib/private/AppConfig.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php index 07eebf1d047..60b0e77f7af 100644 --- 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; } /** |