harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bbcode event formatting issue

Browse Source
This commit is contained in:
zotlabs
2016-10-31 21:48:00 -07:00
parent 4ebd604ca9
commit 863ee9e6dd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/bb2diaspora.php
View File

@@ -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);

3
include/bbcode.php
View File

@@ -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);