Merge pull request #13582 from nextcloud/backport/13573/stable15

MorrisJobke · web-flow · commit 3376e8712200 · 2019-01-14T15:24:04.000+01:00
[stable15] Principals can be principal/user/&lt;name&gt; or principal/&lt;name&gt; from lega…
diff --git a/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php b/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php
@@ -127,6 +127,6 @@ protected function removeConfidentialUncensoredEventActivity(): int {
 
 	protected function getPrincipal(string $principalUri): string {
 		$uri = explode('/', $principalUri);
-		return $uri[2];
+		return array_pop($uri);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,6 @@ protected function removeConfidentialUncensoredEventActivity(): int {`
`127`	`127`
`128`	`128`	`protected function getPrincipal(string $principalUri): string {`
`129`	`129`	`$uri = explode('/', $principalUri);`
`130`		`- return $uri[2];`
	`130`	`+ return array_pop($uri);`
`131`	`131`	`}`
`132`	`132`	`}`