From a1210fe5b0f818235d1b60a931f678e17487228e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 12 Dec 2016 15:26:28 +0100 Subject: [PATCH 1/2] Fix the Todos filter Signed-off-by: Joas Schilling --- apps/dav/lib/CalDAV/Activity/Filter/Todo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dav/lib/CalDAV/Activity/Filter/Todo.php b/apps/dav/lib/CalDAV/Activity/Filter/Todo.php index 42ee0740851..312bb6c472d 100644 --- a/apps/dav/lib/CalDAV/Activity/Filter/Todo.php +++ b/apps/dav/lib/CalDAV/Activity/Filter/Todo.php @@ -79,7 +79,7 @@ class Todo implements IFilter { * @since 11.0.0 */ public function filterTypes(array $types) { - return array_intersect(['calendar_todo'], $types); + return array_intersect(['calendar_todos'], $types); } /** From 29cc292e2a82d1b0888ed96eb8c3a34244c50c1d Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 16 Dec 2016 11:50:50 +0100 Subject: [PATCH 2/2] Fix TodoTest Signed-off-by: Roeland Jago Douma --- apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php b/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php index 54a5a6f5f9d..3c6ac2a5c55 100644 --- a/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php +++ b/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php @@ -67,9 +67,9 @@ class TodoTest extends TestCase { public function dataFilterTypes() { return [ [[], []], - [['calendar_todo'], ['calendar_todo']], - [['calendar', 'calendar_event', 'calendar_todo'], ['calendar_todo']], - [['calendar', 'calendar_todo', 'files'], ['calendar_todo']], + [['calendar_todos'], ['calendar_todos']], + [['calendar', 'calendar_event', 'calendar_todos'], ['calendar_todos']], + [['calendar', 'calendar_todos', 'files'], ['calendar_todos']], ]; }