diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-03-24 23:16:57 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-03-24 23:16:57 +0100 |
| commit | ec12f5e019fff246fa2827fc4175803758870e14 (patch) | |
| tree | cbd5170e8927a46b2da9f9e68ad653017ef31b50 | |
| parent | 1db177b84102e1285359fe9effb91f015d8ff634 (diff) | |
| parent | 70115d5b0351bbe5a51aa5278b728046f0b982bb (diff) | |
| download | nextcloud-server-ec12f5e019fff246fa2827fc4175803758870e14.tar.gz nextcloud-server-ec12f5e019fff246fa2827fc4175803758870e14.zip | |
Merge pull request #14949 from owncloud/sabre-2.1.3
Update sabre-2.1.3 thirdparty submodule
| m--------- | 3rdparty | 0 | ||||
| -rw-r--r-- | lib/private/connector/sabre/principal.php | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/3rdparty b/3rdparty -Subproject 08b820614ae99477d7c9319630f400d22b20e2f +Subproject 244f75dc8d4552bb73a4aa93a1c6eeafdeb801d diff --git a/lib/private/connector/sabre/principal.php b/lib/private/connector/sabre/principal.php index 5db9e505709..b4d8d3ec5fa 100644 --- a/lib/private/connector/sabre/principal.php +++ b/lib/private/connector/sabre/principal.php @@ -177,9 +177,10 @@ class Principal implements \Sabre\DAVACL\PrincipalBackend\BackendInterface { /** * @param string $uri + * @param string $principalPrefix * @return string */ - function findByUri($uri) { + function findByUri($uri, $principalPrefix) { return ''; } } |