diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-05-19 21:42:30 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-05-19 21:42:30 +0200 |
| commit | 30f1ec2521f1983f744c4efdaaed5fe97b6e958d (patch) | |
| tree | b20cd3848e4e27bc2260fd66f3896b9bfbf6cc54 /settings/admin.php | |
| parent | b7981910f7a4bf8815c23714d525633a8c800f18 (diff) | |
| parent | b6d2d6329d99c47fa8a01a7a8db7f8f2de6b9f74 (diff) | |
| download | nextcloud-server-30f1ec2521f1983f744c4efdaaed5fe97b6e958d.tar.gz nextcloud-server-30f1ec2521f1983f744c4efdaaed5fe97b6e958d.zip | |
Merge branch 'master' into test_annotations_working
Conflicts:
lib/private/util.php
Diffstat (limited to 'settings/admin.php')
| -rwxr-xr-x | settings/admin.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/settings/admin.php b/settings/admin.php index bd135435f16..ec93a4c05a1 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -61,6 +61,7 @@ $tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS); $tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false)); $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes')); +$tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired()); $tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes')); $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes')); $tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes')); |