From 49299ed1c182a55f63f10a5e493390808597133a 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 bd75b04eed..db2fb13785 100644 --- a/apps/settings/templates/settings/admin/sharing.php +++ b/apps/settings/templates/settings/admin/sharing.php @@ -56,7 +56,7 @@ ' /> t('days')); ?> - /> diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index 7c9abeefa2..6a89bc8881 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -160,7 +160,7 @@ class JSConfigHelper { $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;