hide embed tags on activitypub export

This commit is contained in:
Mike Macgirvin 2023-04-26 07:52:21 +10:00
parent 56e60cae6b
commit 98f98409ac
2 changed files with 5 additions and 6 deletions

View file

@ -422,11 +422,11 @@ class Oembed
public static function bbcode2html($text)
public static function bbcode2html($text, $export = false)
{
$stopoembed = get_config("system", "no_oembed");
if ($stopoembed == true) {
return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "<!-- oembed $1 --><i>" . t('Embedding disabled') . " : $1</i><!-- /oembed $1 -->", $text);
if ($stopoembed || $export) {
return preg_replace("/\[embed\](.+?)\[\/embed\]/is", '$1', $text);
}
return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", ['\\Code\\Lib\\Oembed','replacecb'], $text);
}

View file

@ -2196,9 +2196,8 @@ function bbcode($Text, $options = [])
$Text = bb_nakedlinks($Text);
// oembed tag
if (! $export) {
$Text = Oembed::bbcode2html($Text);
}
$Text = Oembed::bbcode2html($Text, $export);
// Avoid triple linefeeds through oembed
$Text = str_replace("<br style='clear:left'></span><br><br>", "<br style='clear:left'></span><br>", $Text);