From 0b8ec429fd11bc0934279ca7b5aec3a0081c0bde Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Tue, 24 Nov 2020 14:17:41 +0100 Subject: [PATCH] Fix the config key on the sharing expire checkbox We don't use `shareapi_internal_enforce_expire_date` anywhere. `shareapi_enforce_internal_expire_date` is the one we want. Signed-off-by: Christoph Wurst --- apps/settings/templates/settings/admin/sharing.php | 2 +- lib/private/Template/JSConfigHelper.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/settings/templates/settings/admin/sharing.php b/apps/settings/templates/settings/admin/sharing.php index 2bca48ce4a95b..843052a5d2895 100644 --- a/apps/settings/templates/settings/admin/sharing.php +++ b/apps/settings/templates/settings/admin/sharing.php @@ -48,7 +48,7 @@ ' /> t( 'days' )); ?> - />

diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index ec11e8456d195..d22a64909b9b7 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -156,7 +156,7 @@ public function getConfig() { $defaultInternalExpireDate = $defaultInternalExpireDateEnforced = null; if ($defaultInternalExpireDateEnabled) { $defaultInternalExpireDate = (int) $this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7'); - $defaultInternalExpireDateEnforced = $this->config->getAppValue('core', 'shareapi_internal_enforce_expire_date', 'no') === 'yes'; + $defaultInternalExpireDateEnforced = $this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes'; } $countOfDataLocation = 0;