diff --git a/include/bbcode.php b/include/bbcode.php
index fed535db57..08bfab3ed7 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -46,16 +46,16 @@ function bb_map_location($match) {
* Note: Can produce a [bookmark] tag in the returned string
*
* @brief Processes [attachment] tags
- * @param string $Text
+ * @param string $return
* @param bool|int $simplehtml
* @param bool $tryoembed
* @return string
*/
-function bb_attachment($Text, $simplehtml = false, $tryoembed = true)
+function bb_attachment($return, $simplehtml = false, $tryoembed = true)
{
- $data = get_attachment_data($Text);
+ $data = get_attachment_data($return);
if (!$data) {
- return $Text;
+ return $return;
}
if (isset($data["title"])) {
@@ -68,49 +68,46 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true)
$data["image"] = "";
}
+ $return = '';
if ($simplehtml == 7) {
- $text = style_url_for_mastodon($data["url"]);
+ $return = style_url_for_mastodon($data["url"]);
} elseif (($simplehtml != 4) && ($simplehtml != 0)) {
- $text = sprintf('%s
', $data["url"], $data["title"]);
+ $return = sprintf('%s
', $data["url"], $data["title"]);
} else {
- if ($simplehtml != 4) {
- $text = sprintf('', $data["type"]);
- }
-
- $oembed = sprintf('[bookmark=%s]%s[/bookmark]', $data['url'], $data['title']);
- if ($tryoembed) {
- try {
- $oembed = OEmbed::getHTML($data['url'], $data['title']);
- } catch (Exception $e) {
- // $oembed isn't modified
+ try {
+ if ($tryoembed) {
+ $return = OEmbed::getHTML($data['url'], $data['title']);
+ } else {
+ throw new Exception('OEmbed is disabled for this attachment.');
+ }
+ } catch (Exception $e) {
+ if ($simplehtml != 4) {
+ $return = sprintf('', $data["type"]);
}
- }
- if (stripos($oembed, "';
}
}
-
- if ($simplehtml != 4) {
- $text .= '';
- }
}
- return trim($data["text"] . ' ' . $text . ' ' . $data["after"]);
+
+ return trim($data["text"] . ' ' . $return . ' ' . $data["after"]);
}
function bb_remove_share_information($Text, $plaintext = false, $nolink = false) {