Merge pull request #14514 from owncloud/stable8-tagmanager-nouser

[stable8] Return null when requesting tags for null user

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/private/tagmanager.php b/lib/private/tagmanager.php
index 6c7eeab87eb..c0ba56a2da8 100644
--- a/lib/private/tagmanager.php
+++ b/lib/private/tagmanager.php
@@ -76,6 +76,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);