From d5e721826239101dffa27ce8031103a665eded8b Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 17 Mar 2015 11:58:43 +0100 Subject: [PATCH 1/3] Update sabre-2.1.3 thirdparty submodule --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index 08b820614ae..db11f18d251 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 08b820614ae99477d7c9319630f400d22b20e2fd +Subproject commit db11f18d251442eeb6e1753b942e45009c65ed50 From 5ea8ab3bb0a8eafef5a5bdee9bcd341484c71d23 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 17 Mar 2015 12:22:29 +0100 Subject: [PATCH 2/3] Fix Principal connector override --- lib/private/connector/sabre/principal.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ''; } } From 70115d5b0351bbe5a51aa5278b728046f0b982bb Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 19 Mar 2015 18:28:06 +0100 Subject: [PATCH 3/3] Update 3rd party ref for sabre 2.1.3 --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index db11f18d251..244f75dc8d4 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit db11f18d251442eeb6e1753b942e45009c65ed50 +Subproject commit 244f75dc8d4552bb73a4aa93a1c6eeafdeb801d8