From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 9 Aug 2012 15:22:56 +0000 (+0200)
Subject: Fix for broken Mail App in OSX Mountain Lion. https://mail.kde.org/pipermail/owncloud... 
X-Git-Tag: v4.5.0beta1~93
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cb736b42e3fe36e05a1db5615113ed8102ae39e7;p=nextcloud-server.git

Fix for broken Mail App in OSX Mountain Lion. https://mail.kde.org/pipermail/owncloud/2012-August/004649.html
---

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;
 
             }
         }