keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BBcode, Tags - changes for #pullrequestreview-197771905

Browse source
This commit is contained in:
Peter Liebetrau 2019-01-29 22:34:28 +01:00
parent 5080778ea6
commit c3e5c77eb3
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Item.php
View file

@ -2441,12 +2441,11 @@ class Item extends BaseObject
"#$2", $item["body"]); "#$2", $item["body"]);
foreach ($tags as $tag) { foreach ($tags as $tag) {
if ((strpos($tag, '#') !== 0) || strpos($tag, '[url=')) { if ((strpos($tag, '#') !== 0) || strpos($tag, '[url=') || $tag[1] == '#') {
continue; continue;
} }
$basetag = str_replace('_',' ',substr($tag,1)); $basetag = str_replace('_',' ',substr($tag,1));
if($basetag[0] != '#') {
$newtag = '#[url=' . System::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]'; $newtag = '#[url=' . System::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
$item["body"] = str_replace($tag, $newtag, $item["body"]); $item["body"] = str_replace($tag, $newtag, $item["body"]);
@ -2458,7 +2457,6 @@ class Item extends BaseObject
$item["tag"] = $newtag . $item["tag"]; $item["tag"] = $newtag . $item["tag"];
} }
} }
}
// Convert back the masked hashtags // Convert back the masked hashtags
$item["body"] = str_replace("#", "#", $item["body"]); $item["body"] = str_replace("#", "#", $item["body"]);