aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorMarcel Klehr <mklehr@gmx.net>2024-01-11 13:27:13 +0100
committerGitHub <noreply@github.com>2024-01-11 13:27:13 +0100
commit477630ed78ac5a8f602e939dff78998891e931a5 (patch)
tree727ff8d37f6e6e09bf21c2d556e947a8e2be58e6 /lib/private
parenta6513336b47c5ae7ca49f45ce292534c088607d9 (diff)
parent67fba0a574a3740976c84bb6498011e8d2cef0f1 (diff)
downloadnextcloud-server-477630ed78ac5a8f602e939dff78998891e931a5.tar.gz
nextcloud-server-477630ed78ac5a8f602e939dff78998891e931a5.zip
Merge branch 'master' into enh/machine-translation-provider-with-id
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/AppConfig.php3
-rw-r--r--lib/private/SystemConfig.php1
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php
index 79c650705b2..f92abb2caad 100644
--- a/lib/private/AppConfig.php
+++ b/lib/private/AppConfig.php
@@ -109,6 +109,9 @@ class AppConfig implements IAppConfig {
'notify_push' => [
'/^cookie$/',
],
+ 'serverinfo' => [
+ '/^token$/',
+ ],
'spreed' => [
'/^bridge_bot_password$/',
'/^hosted-signaling-server-(.*)$/',
diff --git a/lib/private/SystemConfig.php b/lib/private/SystemConfig.php
index c104f001809..bba74e96490 100644
--- a/lib/private/SystemConfig.php
+++ b/lib/private/SystemConfig.php
@@ -55,6 +55,7 @@ class SystemConfig {
'secret' => true,
'updater.secret' => true,
'trusted_proxies' => true,
+ 'preview_imaginary_url' => true,
'proxyuserpwd' => true,
'sentry.dsn' => true,
'sentry.public-dsn' => true,