sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17040 from owncloud/fix-param-naming 

Fix naming of param in private/server.php
remotes/origin/poc-doctrine-migrations
Thomas Müller 2015-06-19 11:36:40 +07:00
parent 78e581d52a 7e046d0595
commit 1b7ec7d5ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/server.php
Unescape Escape View File

@ -785,19 +785,19 @@ class Server extends SimpleContainer implements IServerContainer {
/**
* Get the certificate manager for the user
*
* @param string $uid (optional) if not specified the current loggedin user is used
* @param string $userId (optional) if not specified the current loggedin user is used
* @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
*/
public function getCertificateManager($uid = null) {
if (is_null($uid)) {
public function getCertificateManager($userId = null) {
if (is_null($userId)) {
$userSession = $this->getUserSession();
$user = $userSession->getUser();
if (is_null($user)) {
return null;
}
$uid = $user->getUID();
$userId = $user->getUID();
}
return new CertificateManager($uid, new \OC\Files\View());
return new CertificateManager($userId, new \OC\Files\View());
}
/**