Fix system tag filter AND condition

If one of the results is empty, no need to do array_intersect and return
an empty result directly.

1 files changed, 22 insertions, 0 deletions

diff --git a/apps/dav/tests/unit/connector/sabre/filesreportplugin.php b/apps/dav/tests/unit/connector/sabre/filesreportplugin.php
index 853e52f5039..54badd323f7 100644
--- a/apps/dav/tests/unit/connector/sabre/filesreportplugin.php
+++ b/apps/dav/tests/unit/connector/sabre/filesreportplugin.php
@@ -395,6 +395,28 @@ class FilesReportPlugin extends \Test\TestCase {
 		$this->assertEquals(['222'], array_values($this->plugin->processFilterRules($rules)));
 	}
 
+	public function testProcessFilterRulesAndConditionWithOneEmptyResult() {
+		$this->groupManager->expects($this->any())
+			->method('isAdmin')
+			->will($this->returnValue(true));
+
+		$this->tagMapper->expects($this->at(0))
+			->method('getObjectIdsForTags')
+			->with('123')
+			->will($this->returnValue(['111', '222']));
+		$this->tagMapper->expects($this->at(1))
+			->method('getObjectIdsForTags')
+			->with('456')
+			->will($this->returnValue([]));
+
+		$rules = [
+			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
+			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '456'],
+		];
+
+		$this->assertEquals([], array_values($this->plugin->processFilterRules($rules)));
+	}
+
 	public function testProcessFilterRulesInvisibleTagAsAdmin() {
 		$this->groupManager->expects($this->any())
 			->method('isAdmin')