diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-11-24 18:38:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-24 18:38:46 +0100 |
| commit | 6e279bf6c64e3c769a04c50c6fa2f9d7d3afa30b (patch) | |
| tree | 18419b38ae0d9f0ccf3f24640f1a30733e309489 | |
| parent | bd4931032e683a2428ee80290f71c1e521de813d (diff) | |
| parent | 4b9d8c75ec73fe5e1d37998687a17b017fa3a157 (diff) | |
| download | nextcloud-server-6e279bf6c64e3c769a04c50c6fa2f9d7d3afa30b.tar.gz nextcloud-server-6e279bf6c64e3c769a04c50c6fa2f9d7d3afa30b.zip | |
Merge pull request #24346 from nextcloud/backport/24341/stable20
[stable20] Fix the config key on the sharing expire checkbox
| -rw-r--r-- | apps/settings/templates/settings/admin/sharing.php | 2 | ||||
| -rw-r--r-- | 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 59915c581e7..9f651ce6d6c 100644 --- a/apps/settings/templates/settings/admin/sharing.php +++ b/apps/settings/templates/settings/admin/sharing.php @@ -56,7 +56,7 @@ <input type="text" name='shareapi_internal_expire_after_n_days' id="shareapiInternalExpireAfterNDays" placeholder="<?php p('7')?>" value='<?php p($_['shareInternalExpireAfterNDays']) ?>' /> <?php p($l->t('days')); ?> - <input type="checkbox" name="shareapi_internal_enforce_expire_date" id="shareapiInternalEnforceExpireDate" class="checkbox" + <input type="checkbox" name="shareapi_enforce_internal_expire_date" id="shareapiInternalEnforceExpireDate" class="checkbox" value="1" <?php if ($_['shareInternalEnforceExpireDate'] === 'yes') { print_unescaped('checked="checked"'); } ?> /> diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index e18081f3a8d..ebe799bf4f8 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; |