diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 17:50:30 +0400 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-08-31 17:50:30 +0400 |
| commit | 8009df0b60c71bac41e4ead9ec8e4e92812e0d75 (patch) | |
| tree | a937e0948af28bffff46eb08f24c93712032d26a /settings/personal.php | |
| parent | 73685892ed6f255a916512863cd5549914d071e1 (diff) | |
| parent | 3a85767182e04ac013f59d82cc3a8c4d08bab151 (diff) | |
Merge pull request #10420 from owncloud/external-share-self-signed
Make external shares work with imported self signed certificates
Diffstat (limited to 'settings/personal.php')
| -rw-r--r-- | settings/personal.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/settings/personal.php b/settings/personal.php index b290d6a959e..e6f53d62704 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -8,6 +8,7 @@ OC_Util::checkLoggedIn(); $defaults = new OC_Defaults(); // initialize themable default strings and urls +$certificateManager = \OC::$server->getCertificateManager(); // Highlight navigation entry OC_Util::addScript( 'settings', 'personal' ); @@ -98,6 +99,7 @@ $tmpl->assign('backupKeysExists' , $backupKeysExists); $tmpl->assign('filesStillEncrypted' , $filesStillEncrypted); $tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true)); $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser())); +$tmpl->assign('certs', $certificateManager->listCertificates()); $forms=OC_App::getForms('personal'); $tmpl->assign('forms', array()); |