summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-09-08 21:18:28 +0200
committerGitHub <noreply@github.com>2016-09-08 21:18:28 +0200
commitc16aefcff50b9e63fdc6aaa3c2307b0983bbd56e (patch)
tree3f14f6aaa6d54b437cc5d104f3fe61147280979f /lib
parent5ac26d12f0a771bcaf8a44acdb469b68daebc446 (diff)
parent268c5a0aa010cda1438a32fbbd9d433ebc555902 (diff)
downloadnextcloud-server-c16aefcff50b9e63fdc6aaa3c2307b0983bbd56e.tar.gz
nextcloud-server-c16aefcff50b9e63fdc6aaa3c2307b0983bbd56e.zip
Merge pull request #1317 from nextcloud/add-sharing-disclaimer
Adding a optional disclaimer to the anonymous upload page
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Settings/Admin/Sharing.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Settings/Admin/Sharing.php b/lib/private/Settings/Admin/Sharing.php
index 8d3ddc9b3b5..59821044605 100644
--- a/lib/private/Settings/Admin/Sharing.php
+++ b/lib/private/Settings/Admin/Sharing.php
@@ -65,6 +65,7 @@ class Sharing implements ISettings {
'shareEnforceExpireDate' => $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no'),
'shareExcludeGroups' => $this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes' ? true : false,
'shareExcludedGroupsList' => $excludeGroupsList,
+ 'publicShareDisclaimerText' => $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext', null),
];
return new TemplateResponse('settings', 'admin/sharing', $parameters, '');