From b2c58bf5a66217ecba51331b34add22a2652d02a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 9 Aug 2012 17:46:50 +0200
Subject: [PATCH] Fix for broken Mail App in OSX Mountain Lion.
https://mail.kde.org/pipermail/owncloud/2012-August/004649.html
---
3rdparty/Sabre/CardDAV/Plugin.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/3rdparty/Sabre/CardDAV/Plugin.php b/3rdparty/Sabre/CardDAV/Plugin.php
index ca20e46849..96def6dd96 100755
--- a/3rdparty/Sabre/CardDAV/Plugin.php
+++ b/3rdparty/Sabre/CardDAV/Plugin.php
@@ -154,7 +154,10 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
$val = stream_get_contents($val);
// Taking out \r to not screw up the xml output
- $returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
+ //$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;
}
}
--
GitLab