aboutsummaryrefslogtreecommitdiffstats
path: root/include/event.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-20 19:03:18 -0700
committerredmatrix <git@macgirvin.com>2016-07-20 19:03:18 -0700
commit6a56a509d3df833c82b876cf89f0bbab2a26c641 (patch)
treef78ed120a535606929d3f701f917fc048a70a8c2 /include/event.php
parentdf0cd4dbc7fbd4d31a953144e0af75ab27447969 (diff)
parent779885f9afe99980c32d2bf30757cc655e5d9427 (diff)
downloadvolse-hubzilla-6a56a509d3df833c82b876cf89f0bbab2a26c641.tar.gz
volse-hubzilla-6a56a509d3df833c82b876cf89f0bbab2a26c641.tar.bz2
volse-hubzilla-6a56a509d3df833c82b876cf89f0bbab2a26c641.zip
Merge branch 'dev' into perms
Diffstat (limited to 'include/event.php')
-rw-r--r--include/event.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/event.php b/include/event.php
index a4118ec78..3d650cd14 100644
--- a/include/event.php
+++ b/include/event.php
@@ -183,7 +183,9 @@ function format_ical_text($s) {
require_once('include/bbcode.php');
require_once('include/html2plain.php');
- return(wordwrap(str_replace(array(',',';','\\'),array('\\,','\\;','\\\\'),html2plain(bbcode($s))),72,"\r\n ",true));
+ $s = html2plain(bbcode($s));
+ $s = str_replace(["\r\n","\n"],["",""],$s);
+ return(wordwrap(str_replace(['\\',',',';'],['\\\\','\\,','\\;'],$s),72,"\r\n ",true));
}