From 67da1f7e5ac9fc5472b6041dcfdc81a4b8428379 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 20 Jan 2015 17:00:29 +0100
Subject: certificate manager only needs the user-id, no need to pass on the
 complete user object

---
 lib/private/server.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'lib/private/server.php')

diff --git a/lib/private/server.php b/lib/private/server.php
index c98f77c6479..672245c3528 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -249,7 +249,9 @@ class Server extends SimpleContainer implements IServerContainer {
 		});
 		$this->registerService('HTTPHelper', function (Server $c) {
 			$config = $c->getConfig();
-			return new HTTPHelper($config, new \OC\Security\CertificateManager($c->getUserSession()->getUser()));
+			$user = $c->getUserSession()->getUser();
+			$uid = $user ? $user->getUID() : null;
+			return new HTTPHelper($config, new \OC\Security\CertificateManager($uid));
 		});
 		$this->registerService('EventLogger', function (Server $c) {
 			if (defined('DEBUG') and DEBUG) {
@@ -631,18 +633,19 @@ class Server extends SimpleContainer implements IServerContainer {
 	/**
 	 * Get the certificate manager for the user
 	 *
-	 * @param \OCP\IUser $user (optional) if not specified the current loggedin user is used
+	 * @param string $uid (optional) if not specified the current loggedin user is used
 	 * @return \OCP\ICertificateManager
 	 */
-	function getCertificateManager($user = null) {
-		if (is_null($user)) {
+	function getCertificateManager($uid = null) {
+		if (is_null($uid)) {
 			$userSession = $this->getUserSession();
 			$user = $userSession->getUser();
 			if (is_null($user)) {
 				return null;
 			}
+			$uid = $user->getUID();
 		}
-		return new CertificateManager($user);
+		return new CertificateManager($uid);
 	}
 
 	/**
-- 
cgit v1.2.3