diff options
| author | Robin Appelman <icewind@owncloud.com> | 2015-12-22 17:42:28 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2016-01-12 12:50:59 +0100 |
| commit | c15cab7ed6bf2d3ce9009ca09c7c5f33b252860f (patch) | |
| tree | 08d3aefd146ce159b23073958f2fb7e96ace4143 /lib/private/server.php | |
| parent | 0c0829fbc73ce10ea1a951989c20973b6b5faa16 (diff) | |
| download | nextcloud-server-c15cab7ed6bf2d3ce9009ca09c7c5f33b252860f.tar.gz nextcloud-server-c15cab7ed6bf2d3ce9009ca09c7c5f33b252860f.zip | |
Allow admins to add system wide root certificates
Diffstat (limited to 'lib/private/server.php')
| -rw-r--r-- | lib/private/server.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/server.php b/lib/private/server.php index ead9fa95db8..414f59af612 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -921,11 +921,11 @@ class Server extends ServerContainer implements IServerContainer { /** * Get the certificate manager for the user * - * @param string $userId (optional) if not specified the current loggedin user is used + * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in */ - public function getCertificateManager($userId = null) { - if (is_null($userId)) { + public function getCertificateManager($userId = '') { + if ($userId === '') { $userSession = $this->getUserSession(); $user = $userSession->getUser(); if (is_null($user)) { |