summaryrefslogtreecommitdiffstats
path: root/3rdparty
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/Sabre/CardDAV/Plugin.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/3rdparty/Sabre/CardDAV/Plugin.php b/3rdparty/Sabre/CardDAV/Plugin.php
index 9ebec243eb0..095769feddc 100644
--- a/3rdparty/Sabre/CardDAV/Plugin.php
+++ b/3rdparty/Sabre/CardDAV/Plugin.php
@@ -153,6 +153,9 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
// Taking out \r to not screw up the xml output
$returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
+ // The stripping of \r breaks the Mail App in OSX Mountain Lion
+ // this is fixed in master, but not backported. /Tanghus
+ $returnedProperties[200][$addressDataProp] = $val;
}
}