diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-12-05 22:35:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-05 22:35:47 +0100 |
| commit | fc6dd2d4cb49282cd00df48128c436ac8e9f416e (patch) | |
| tree | b250c5e7b9216c4261d5153a492f2a6c4a3a684e /apps | |
| parent | 4b27584e494e2aa2e05cda38df4a3712614953f3 (diff) | |
| parent | ea33663328bec6ae63a2748c5dc1f77a04934ce4 (diff) | |
| download | nextcloud-server-fc6dd2d4cb49282cd00df48128c436ac8e9f416e.tar.gz nextcloud-server-fc6dd2d4cb49282cd00df48128c436ac8e9f416e.zip | |
Merge pull request #12836 from nextcloud/backport/12624/stable15
[stable15] 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], ]; |