diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2024-01-16 16:21:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-16 16:21:57 +0100 |
| commit | c69be30db44115a307f1a2c7ee629af9c5b6c1c7 (patch) | |
| tree | 320f3f0ea75468b4698bd39657179da8ef72f008 | |
| parent | 41fa99ac466062ef49bc9a5dbe71169c295176ee (diff) | |
| parent | addd67868249023d99b724ba8887a08e59f468d4 (diff) | |
| download | nextcloud-server-c69be30db44115a307f1a2c7ee629af9c5b6c1c7.tar.gz nextcloud-server-c69be30db44115a307f1a2c7ee629af9c5b6c1c7.zip | |
Merge pull request #42844 from nextcloud/fix/noid/default-on-unknown-config-key
AppConfig: returns default on exception
| -rw-r--r-- | lib/private/AppConfig.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php index e8192530c17..505d5c52696 100644 --- a/lib/private/AppConfig.php +++ b/lib/private/AppConfig.php @@ -292,11 +292,17 @@ class AppConfig implements IAppConfig { string $default = '', ?bool $lazy = false ): string { + try { + $lazy = ($lazy === null) ? $this->isLazy($app, $key) : $lazy; + } catch (AppConfigUnknownKeyException $e) { + return $default; + } + return $this->getTypedValue( $app, $key, $default, - ($lazy === null) ? $this->isLazy($app, $key) : $lazy, + $lazy, self::VALUE_MIXED ); } |