friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Possibly handle issue 7772

This commit is contained in:
Michael 2019-10-27 18:36:04 +00:00
parent 30a6231f11
commit 945e256b7b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Content/Text/BBCode.php
View File

@ -573,17 +573,17 @@ class BBCode extends BaseObject
* Note: Can produce a [bookmark] tag in the returned string * Note: Can produce a [bookmark] tag in the returned string
* *
* @brief Processes [attachment] tags * @brief Processes [attachment] tags
* @param string $return * @param string $text
* @param bool|int $simplehtml * @param bool|int $simplehtml
* @param bool $tryoembed * @param bool $tryoembed
* @return string * @return string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
private static function convertAttachment($return, $simplehtml = false, $tryoembed = true) private static function convertAttachment($text, $simplehtml = false, $tryoembed = true)
{ {
$data = self::getAttachmentData($return); $data = self::getAttachmentData($text);
if (empty($data) || empty($data['url'])) { if (empty($data) || empty($data['url'])) {
return $return; return $text;
} }
if (isset($data['title'])) { if (isset($data['title'])) {
@ -600,7 +600,10 @@ class BBCode extends BaseObject
$return = ''; $return = '';
if (in_array($simplehtml, [7, 9])) { if (in_array($simplehtml, [7, 9])) {
$return = self::convertUrlForActivityPub($data['url']); // Only add the link when it isn't already part of the body
if (substr_count($text, $data['url']) == 1) {
$return = self::convertUrlForActivityPub($data['url']);
}
} elseif (($simplehtml != 4) && ($simplehtml != 0)) { } elseif (($simplehtml != 4) && ($simplehtml != 0)) {
$return = sprintf('<a href="%s" target="_blank">%s</a><br>', $data['url'], $data['title']); $return = sprintf('<a href="%s" target="_blank">%s</a><br>', $data['url'], $data['title']);
} else { } else {