Merge 4144b0f into b9d546d

Author: backportbot[bot]

lib/Data.php

@@ -519,7 +519,7 @@ public function getActivitySince(string $user, int $since, bool $byOthers) {
 			$query->andWhere($query->expr()->neq('user', $nameParam));
 		}
 
-		return $query->executeQuery()->fetch();
+		return $query->executeQuery()->fetch() ?: [];
 	}
 
 	/**

lib/FilesHooks.php

@@ -826,7 +826,7 @@ public function unShareSelf(IShare $share) {
 		if (in_array($share->getNodeType(), ['file', 'folder'], true)) {
 			if ($share->getShareType() === IShare::TYPE_GROUP) {
 				$this->unshareFromSelfGroup($share);
-			} else {
+			} elseif ($share->getShareType() === IShare::TYPE_USER) {
 				$this->unshareFromUser($share);
 			}
 		}

tests/FilesHooksTest.php

@@ -962,6 +962,8 @@ public function testLeaveShare(): void {
 			->willReturn('file');
 		$share->method('getSharedWith')
 			->willReturn('with');
+		$share->method('getShareType')
+			->willReturn(IShare::TYPE_USER);
 
 		$this->settings->expects($this->exactly(3))
 			->method('getUserSetting')