Exporting and Importing ICS-Files

[friendica-addons.git] / dav / common / calendar.fnk.php

diff --git a/dav/common/calendar.fnk.php b/dav/common/calendar.fnk.php
index 27f51621b3240996faf43f46aad90ea7143884ee..22f1d18c51d25caf7c6292ad242cfae2345f879b 100644 (file)
--- a/dav/common/calendar.fnk.php
+++ b/dav/common/calendar.fnk.php
@@ -185,12 +185,7 @@ function wdcal_mySql2icalTime($myqlDate)
  */
 function icalendar_sanitize_string($str = "")
 {
-       $str = str_replace("\r\n", "\n", $str);
-       $str = str_replace("\n\r", "\n", $str);
-       $str = str_replace("\r", "\n", $str);
-       $str = str_replace("\n\n", "\n", $str);
-       $str = str_replace("\n\n", "\n", $str);
-       return $str;
+       return preg_replace("/[\\r\\n]+/siu", "\r\n", $str);
 }
 
 
@@ -361,10 +356,8 @@ function dav_create_empty_vevent($uid = "")
 }
 
 
-
-
 /**
- * @param Sabre_VObject_Component_VEvent $vObject
+ * @param Sabre_VObject_Component_VCalendar $vObject
  * @return Sabre_VObject_Component_VEvent|null
  */
 function dav_get_eventComponent(&$vObject)