Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts: doc/to_do_code.bb
2015-07-21 17:13:48 -07:00
parent 24ec104819 3ec6a431b6
commit c90f14c066
24 changed files with 48 additions and 29 deletions
--- a/include/event.php
+++ b/include/event.php
@@ -100,7 +100,7 @@ function format_ical_text($s) {
 	require_once('include/bbcode.php');
 	require_once('include/html2plain.php');

-	return(wordwrap(html2plain(bbcode($s)),72,"\n ",true));
+	return(wordwrap(str_replace(',','\\,',html2plain(bbcode($s))),72,"\n ",true));
 }