aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-06-19 11:36:40 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-06-19 11:36:40 +0200
commit1b7ec7d5ecbee85aa8b111219bb6c84a13c12f15 (patch)
tree3ce6aea8038aa5073aec42ac231e6bdbfb96c051
parent78e581d52a991a520b88db6b26bacac15eaa5c8e (diff)
parent7e046d05956fdea9231b4d704abeb94bbd971934 (diff)
downloadnextcloud-server-1b7ec7d5ecbee85aa8b111219bb6c84a13c12f15.tar.gz
nextcloud-server-1b7ec7d5ecbee85aa8b111219bb6c84a13c12f15.zip
Merge pull request #17040 from owncloud/fix-param-naming
Fix naming of param in private/server.php
-rw-r--r--lib/private/server.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/server.php b/lib/private/server.php
index 497f43206ff..7e233e64575 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -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());
}
/**