ActivityManager can be initialized with null for the session variable…

… in the ctor This reverts commit 2cf02a0.
owncloud · Jul 17, 2017 · 6c61d4f · 6c61d4f
1 parent f7ee3b9
commit 6c61d4f
Show file tree

Hide file tree

Showing 2 changed files with 529 additions and 3 deletions.
diff --git a/lib/private/Activity/Manager.php b/lib/private/Activity/Manager.php
@@ -59,7 +59,7 @@ class Manager implements IManager {
 	 * @param IConfig $config
 	 */
 	public function __construct(IRequest $request,
-								IUserSession $session,
+								IUserSession $session = null,
 								IConfig $config) {
 		$this->request = $request;
 		$this->session = $session;
@@ -177,7 +177,7 @@ public function publish(IEvent $event) {
 		}
 
 		if ($event->getAuthor() === null) {
-			if ($this->session->getUser() instanceof IUser) {
+			if ($this->session !== null && $this->session->getUser() instanceof IUser) {
 				$event->setAuthor($this->session->getUser()->getUID());
 			}
 		}
@@ -501,7 +501,7 @@ public function setCurrentUserId($currentUserId) {
 	public function getCurrentUserId() {
 		if ($this->currentUserId !== null) {
 			return $this->currentUserId;
-		} else if (!$this->session->isLoggedIn()) {
+		} else if ($this->session === null || !$this->session->isLoggedIn()) {
 			return $this->getUserFromToken();
 		} else {
 			return $this->session->getUser()->getUID();