From 359e19a19dd45d64d14c7b29461f0fbe4f8a50bd Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 03 Aug 2011 06:40:29 -0400
Subject: [PATCH] - Fix EOL character in vCard exports (#1487873)
---
program/include/rcube_vcard.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php
index 90ee7da..c7dfe53 100644
--- a/program/include/rcube_vcard.php
+++ b/program/include/rcube_vcard.php
@@ -33,7 +33,7 @@
'FN' => array(),
'N' => array(array('','','','','')),
);
- static private $fieldmap = array(
+ private static $fieldmap = array(
'phone' => 'TEL',
'birthday' => 'BDAY',
'website' => 'URL',
@@ -65,6 +65,7 @@
public $notes;
public $email = array();
+ public static $eol = "\r\n";
/**
* Constructor
@@ -640,11 +641,11 @@
if (self::is_empty($value))
continue;
- $vcard .= self::vcard_quote($type) . $attr . ':' . self::vcard_quote($value) . "\n";
+ $vcard .= self::vcard_quote($type) . $attr . ':' . self::vcard_quote($value) . self::$eol;
}
}
- return "BEGIN:VCARD\nVERSION:3.0\n{$vcard}END:VCARD";
+ return 'BEGIN:VCARD' . self::$eol . 'VERSION:3.0' . self::$eol . $vcard . 'END:VCARD';
}
--
Gitblit v1.9.1