diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-12-04 22:48:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-04 22:48:54 +0100 |
| commit | d8314b102ef93aa0a5bda1d3c4fe4de0b5a01be8 (patch) | |
| tree | 7161b964501ec7aa7b55038d3e6b1ac5f0d445ad /apps | |
| parent | f6924091207cc7fb4d11804cd3897b01a9f5efa9 (diff) | |
| parent | 99bcc1363ecf33736993d83ff24ae5374f0d0f9a (diff) | |
| download | nextcloud-server-d8314b102ef93aa0a5bda1d3c4fe4de0b5a01be8.tar.gz nextcloud-server-d8314b102ef93aa0a5bda1d3c4fe4de0b5a01be8.zip | |
Merge pull request #12624 from nextcloud/bugfix/noid/validate-all-rich-objects
Validate all rich objects
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/CalDAV/Activity/Provider/Base.php | 2 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/lib/Activity/Providers/Groups.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Base.php b/apps/dav/lib/CalDAV/Activity/Provider/Base.php index 99ad903f247..ee9c6716130 100644 --- a/apps/dav/lib/CalDAV/Activity/Provider/Base.php +++ b/apps/dav/lib/CalDAV/Activity/Provider/Base.php @@ -160,7 +160,7 @@ abstract class Base implements IProvider { } return [ - 'type' => 'group', + 'type' => 'user-group', 'id' => $gid, 'name' => $this->groupDisplayNames[$gid], ]; diff --git a/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php b/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php index 37a56f88042..9c4f5eeb47c 100644 --- a/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php +++ b/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php @@ -182,7 +182,7 @@ class BaseTest extends TestCase { */ public function testGenerateGroupParameter($gid) { $this->assertEquals([ - 'type' => 'group', + 'type' => 'user-group', 'id' => $gid, 'name' => $gid, ], $this->invokePrivate($this->provider, 'generateGroupParameter', [$gid])); diff --git a/apps/files_sharing/lib/Activity/Providers/Groups.php b/apps/files_sharing/lib/Activity/Providers/Groups.php index 9a8f7164c55..10f52882aeb 100644 --- a/apps/files_sharing/lib/Activity/Providers/Groups.php +++ b/apps/files_sharing/lib/Activity/Providers/Groups.php @@ -150,7 +150,7 @@ class Groups extends Base { } return [ - 'type' => 'group', + 'type' => 'user-group', 'id' => $gid, 'name' => $this->groupDisplayNames[$gid], ]; |