diff options
| -rw-r--r-- | include/bb2diaspora.php | 2 | ||||
| -rw-r--r-- | include/bbcode.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 514b2b339..da02d6cac 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -449,6 +449,8 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { $md = new Markdownify(false, false, false); $Text = $md->parseString($Text); + + // It also adds backslashes to our attempt at getting around the html entity preservation for some weird reason. $Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('<','>','&'),$Text); diff --git a/include/bbcode.php b/include/bbcode.php index c3041c6a6..75e8a0f52 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -550,7 +550,6 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) // process [observer] tags before we do anything else because we might // be stripping away stuff that then doesn't need to be worked on anymore - if($cache) $observer = false; else @@ -1028,7 +1027,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) // Summary (e.g. title) is required, earlier revisions only required description (in addition to // start which is always required). Allow desc with a missing summary for compatibility. - if ((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) { + if ((x($ev,'desc') || x($ev,'summary')) && x($ev,'dtstart')) { $sub = format_event_html($ev); |