summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-08-09 17:22:56 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-08-09 17:22:56 +0200
commita366ba4c0c6cebb1e703bdc3777b71a4bb766281 (patch)
treeac2d01c2fc88af6539edc456934edff5cf9443dd
parent2cfc7f7454fb29e1aba1420a8d3df5cdcb8ff852 (diff)
downloadnextcloud-server-a366ba4c0c6cebb1e703bdc3777b71a4bb766281.tar.gz
nextcloud-server-a366ba4c0c6cebb1e703bdc3777b71a4bb766281.zip
Fix for broken Mail App in OSX Mountain Lion. https://mail.kde.org/pipermail/owncloud/2012-August/004649.html
-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;
}
}