Return null when requesting tags for null user

The TagManager->load() now returns null if the user is not authenticated
instead of failing with an error.

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/private/tagmanager.php b/lib/private/tagmanager.php
index 9bc461f25eb..1c7ace11469 100644
--- a/lib/private/tagmanager.php
+++ b/lib/private/tagmanager.php
@@ -65,6 +65,11 @@ class TagManager implements \OCP\ITagManager {
 	*/
 	public function load($type, $defaultTags = array(), $includeShared = false, $userId = null) {
 		if (is_null($userId)) {
+			$user = $this->userSession->getUser();
+			if ($user === null) {
+				// nothing we can do without a user
+				return null;
+			}
 			$userId = $this->userSession->getUser()->getUId();
 		}
 		return new Tags($this->mapper, $userId, $type, $defaultTags, $includeShared);