diff options
author | Morris Jobke <hey@morrisjobke.de> | 2020-12-02 01:24:39 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-02 01:24:39 +0300 |
commit | f0897d81c1b2979896ab5f2c248c25953d3f23a7 (patch) | |
tree | a5135706d9da9b91ed6ed7f764808b30ae2eadda | |
parent | d173f306ec9bde808cb0b6837208d98a6d3e6c20 (diff) | |
parent | 0b8ec429fd11bc0934279ca7b5aec3a0081c0bde (diff) |
Merge pull request #24481 from nextcloud/backport/23677/stable18
[stable18] 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 2bca48ce4a9..843052a5d28 100644 --- a/apps/settings/templates/settings/admin/sharing.php +++ b/apps/settings/templates/settings/admin/sharing.php @@ -48,7 +48,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"'); ?> /> <label for="shareapiInternalEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/> </p> diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php index ec11e8456d1..d22a64909b9 100644 --- a/lib/private/Template/JSConfigHelper.php +++ b/lib/private/Template/JSConfigHelper.php @@ -156,7 +156,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; |