summaryrefslogtreecommitdiffstats
path: root/3rdparty
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-08-09 17:22:56 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2012-08-24 14:58:47 +0200
commitcb736b42e3fe36e05a1db5615113ed8102ae39e7 (patch)
tree1f91246b84a9e3d179ca6a51e643f07cd6df5a4d /3rdparty
parent0ac8434670998f712411da01183890725c27d555 (diff)
downloadnextcloud-server-cb736b42e3fe36e05a1db5615113ed8102ae39e7.tar.gz
nextcloud-server-cb736b42e3fe36e05a1db5615113ed8102ae39e7.zip
Fix for broken Mail App in OSX Mountain Lion. https://mail.kde.org/pipermail/owncloud/2012-August/004649.html
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;
}
}