mirror of
https://github.com/friendica/friendica
synced 2024-11-10 23:42:53 +00:00
Escape potential URL-containing BBCodes before running autolinker
This commit is contained in:
parent
0b13a7acd3
commit
e1583123b4
1 changed files with 21 additions and 0 deletions
|
@ -1507,8 +1507,29 @@ class BBCode extends BaseObject
|
|||
$text = str_replace('[hr]', '<hr />', $text);
|
||||
|
||||
if (!$for_plaintext) {
|
||||
$escaped = [];
|
||||
|
||||
// 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()
|
||||
|
|
Loading…
Reference in a new issue