Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 03:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue 14294: Fix event parsing

Browse source
This commit is contained in:
Michael 2024-08-30 03:33:29 +00:00
parent 4dd64b1a5d
commit 99dfb7d59e
4 changed files with 3301 additions and 3302 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Content/Text/BBCode.php
View file

@ -1306,8 +1306,10 @@ class BBCode
Hook::callAll('bbcode', $text);
$text = self::performWithEscapedTags($text, ['code'], function ($text) use ($try_oembed, $simple_html, $for_plaintext, $uriid) {
$text = self::performWithEscapedTags($text, ['noparse', 'nobb', 'pre'], function ($text) use ($try_oembed, $simple_html, $for_plaintext, $uriid) {
$ev = Event::fromBBCode($text);
$text = self::performWithEscapedTags($text, ['code'], function ($text) use ($try_oembed, $simple_html, $for_plaintext, $uriid, $ev) {
$text = self::performWithEscapedTags($text, ['noparse', 'nobb', 'pre'], function ($text) use ($try_oembed, $simple_html, $for_plaintext, $uriid, $ev) {
/*
* preg_match_callback function to replace potential Oembed tags with Oembed content
*
@ -1361,7 +1363,7 @@ class BBCode
$text = self::convertQuotesToHtml($text);
$text = self::convertVideoPlatformsToHtml($text, $try_oembed);
$text = self::convertOEmbedToHtml($text, $uriid);
$text = self::convertEventsToHtml($text, $simple_html, $uriid);
$text = self::convertEventsToHtml($text, $simple_html, $uriid, $ev);
// Some simpler non standard elements
$text = self::convertEmojisToHtml($text, $simple_html);
@ -1510,14 +1512,12 @@ class BBCode
return $text;
}
private static function convertEventsToHtml(string $text, int $simple_html, int $uriid): string
private static function convertEventsToHtml(string $text, int $simple_html, int $uriid, array $ev): string
{
// If we find any event code, turn it into an event.
// After we're finished processing the bbcode we'll
// replace all of the event code with a reformatted version.
$ev = Event::fromBBCode($text);
// If we found an event earlier, strip out all the event code and replace with a reformatted version.
// Replace the event-start section with the entire formatted event. The other bbcode is stripped.
// Summary (e.g. title) is required, earlier revisions only required description (in addition to