diff options
author | Joas Schilling <coding@schilljs.com> | 2017-01-10 12:28:55 +0100 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2017-01-10 12:28:55 +0100 |
commit | a70a081fffffaf092a97d563baaa95ff29c6e477 (patch) | |
tree | 32ec8fd042e5f02a32cbbd32c8e0e78800ad660d /apps/dav | |
parent | 97a63ad689fd00ef5b6bd09bd138dccb27562106 (diff) | |
download | nextcloud-server-a70a081fffffaf092a97d563baaa95ff29c6e477.tar.gz nextcloud-server-a70a081fffffaf092a97d563baaa95ff29c6e477.zip |
Make sure the used event type and the setting/filter are the same
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/dav')
-rw-r--r-- | apps/dav/lib/CalDAV/Activity/Filter/Todo.php | 2 | ||||
-rw-r--r-- | apps/dav/lib/CalDAV/Activity/Setting/Todo.php | 2 | ||||
-rw-r--r-- | apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/dav/lib/CalDAV/Activity/Filter/Todo.php b/apps/dav/lib/CalDAV/Activity/Filter/Todo.php index 312bb6c472d..42ee0740851 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_todos'], $types); + return array_intersect(['calendar_todo'], $types); } /** diff --git a/apps/dav/lib/CalDAV/Activity/Setting/Todo.php b/apps/dav/lib/CalDAV/Activity/Setting/Todo.php index 0c8215f4843..234774bfea4 100644 --- a/apps/dav/lib/CalDAV/Activity/Setting/Todo.php +++ b/apps/dav/lib/CalDAV/Activity/Setting/Todo.php @@ -42,7 +42,7 @@ class Todo implements ISetting { * @since 11.0.0 */ public function getIdentifier() { - return 'calendar_todos'; + return 'calendar_todo'; } /** diff --git a/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php b/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php index 3c6ac2a5c55..54a5a6f5f9d 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_todos'], ['calendar_todos']], - [['calendar', 'calendar_event', 'calendar_todos'], ['calendar_todos']], - [['calendar', 'calendar_todos', 'files'], ['calendar_todos']], + [['calendar_todo'], ['calendar_todo']], + [['calendar', 'calendar_event', 'calendar_todo'], ['calendar_todo']], + [['calendar', 'calendar_todo', 'files'], ['calendar_todo']], ]; } |