diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-09-29 14:28:57 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-09-29 14:28:57 +0200 |
| commit | 2086bc4be77ba64337b721cec1cac544c1c58452 (patch) | |
| tree | 1ce50e6854664b8e8dcf2b741551cd417de88fdd /3rdparty/Sabre/DAVACL | |
| parent | fcc6d61fe195e090da33f213312d3d8bec8c1c71 (diff) | |
| download | nextcloud-server-2086bc4be77ba64337b721cec1cac544c1c58452.tar.gz nextcloud-server-2086bc4be77ba64337b721cec1cac544c1c58452.zip | |
update sabredav to 1.5.3
Diffstat (limited to '3rdparty/Sabre/DAVACL')
| -rw-r--r-- | 3rdparty/Sabre/DAVACL/Principal.php | 13 | ||||
| -rw-r--r-- | 3rdparty/Sabre/DAVACL/Version.php | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/3rdparty/Sabre/DAVACL/Principal.php b/3rdparty/Sabre/DAVACL/Principal.php index 158b271058c..790603c900f 100644 --- a/3rdparty/Sabre/DAVACL/Principal.php +++ b/3rdparty/Sabre/DAVACL/Principal.php @@ -68,12 +68,19 @@ class Sabre_DAVACL_Principal extends Sabre_DAV_Node implements Sabre_DAVACL_IPri */ public function getAlternateUriSet() { + $uris = array(); + if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) { + + $uris = $this->principalProperties['{DAV:}alternate-URI-set']; + + } + if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) { - return array('mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address']); - } else { - return array(); + $uris[] = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address']; } + return array_unique($uris); + } /** diff --git a/3rdparty/Sabre/DAVACL/Version.php b/3rdparty/Sabre/DAVACL/Version.php index a705507486c..124463e311e 100644 --- a/3rdparty/Sabre/DAVACL/Version.php +++ b/3rdparty/Sabre/DAVACL/Version.php @@ -14,7 +14,7 @@ class Sabre_DAVACL_Version { /** * Full version number */ - const VERSION = '1.4.4'; + const VERSION = '1.5.2'; /** * Stability : alpha, beta, stable |