clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7779 from annando/fix-tag 

(hopefully) fix preview issue with tags on Mastodon
This commit is contained in:
Tobias Diekershoff 2019-10-27 21:14:47 +01:00 committed by GitHub
parent 4176acc710 945e256b7b
commit 87ed05e2f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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 {
@ -1748,7 +1751,7 @@ class BBCode extends BaseObject
$text = preg_replace_callback("/(?:#\[url\=.*?\]|\[url\=.*?\]#)(.*?)\[\/url\]/ism", function($matches) { $text = preg_replace_callback("/(?:#\[url\=.*?\]|\[url\=.*?\]#)(.*?)\[\/url\]/ism", function($matches) {
return '#<a href="' return '#<a href="'
. System::baseUrl() . '/search?tag=' . rawurlencode($matches[1]) . System::baseUrl() . '/search?tag=' . rawurlencode($matches[1])
. '" class="tag" title="' . XML::escape($matches[1]) . '">' . '" class="tag" rel="tag" title="' . XML::escape($matches[1]) . '">'
. XML::escape($matches[1]) . XML::escape($matches[1])
. '</a>'; . '</a>';
}, $text); }, $text);