Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify code in Content\Text\BBCode::convert

Browse source 
- Use performWithEscapedTags instead of custom solution
This commit is contained in:
Hypolite Petovan 2020-11-08 23:25:46 -05:00
parent 5ca90e5a74
commit edd439cfab
1 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1509,29 +1509,9 @@ class BBCode
$text = str_replace('[hr]', '<hr />', $text); $text = str_replace('[hr]', '<hr />', $text);
if (!$for_plaintext) { if (!$for_plaintext) {
$escaped = []; $text = self::performWithEscapedTags($text, ['url', 'img', 'audio', 'video', 'youtube', 'vimeo', 'share', 'attachment', 'iframe', 'bookmark'], function ($text) {
return preg_replace(Strings::autoLinkRegEx(), '[url]$1[/url]', $text);
// Escaping BBCodes susceptible to contain rogue URL we don'' want the autolinker to catch });
$text = preg_replace_callback('#\[(url|img|audio|video|youtube|vimeo|share|attachment|iframe|bookmark).+?\[/\1\]#ism',
function ($matches) use (&$escaped) {
$return = '{escaped-' . count($escaped) . '}';
$escaped[] = $matches[0];
return $return;
},
$text
);
// Autolinker for isolated URLs
$text = preg_replace(Strings::autoLinkRegEx(), '[url]$1[/url]', $text);
// Restoring escaped blocks
$text = preg_replace_callback('/{escaped-([0-9]+)}/iU',
function ($matches) use ($escaped) {
return $escaped[intval($matches[1])] ?? $matches[0];
},
$text
);
} }
// This is actually executed in Item::prepareBody() // This is actually executed in Item::prepareBody()