sforkowany z mirror/friendica
Merge pull request #2109 from annando/1511-duplicated-tags-diaspora
Avoid duplicated tags in postings to Diaspora2022.09-rc
commit
b67f33f6d5
|
@ -83,7 +83,6 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
|
||||||
'return \'#\'. str_replace(\' \', \'_\', $match[2]);'
|
'return \'#\'. str_replace(\' \', \'_\', $match[2]);'
|
||||||
), $Text);
|
), $Text);
|
||||||
|
|
||||||
|
|
||||||
// Converting images with size parameters to simple images. Markdown doesn't know it.
|
// Converting images with size parameters to simple images. Markdown doesn't know it.
|
||||||
$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
|
$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
|
||||||
|
|
||||||
|
@ -94,11 +93,12 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
|
||||||
// Add all tags that maybe were removed
|
// Add all tags that maybe were removed
|
||||||
if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$OriginalText, $tags)) {
|
if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$OriginalText, $tags)) {
|
||||||
$tagline = "";
|
$tagline = "";
|
||||||
foreach($tags[2] as $tag)
|
foreach($tags[2] as $tag) {
|
||||||
if (!strpos($Text, "#".$tag))
|
$tag = html_entity_decode($tag, ENT_QUOTES, 'UTF-8');
|
||||||
|
if (!strpos(html_entity_decode($Text, ENT_QUOTES, 'UTF-8'), "#".$tag))
|
||||||
$tagline .= "#".$tag." ";
|
$tagline .= "#".$tag." ";
|
||||||
|
}
|
||||||
$Text = $Text."<br />".$tagline;
|
$Text = $Text." ".$tagline;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else
|
} else
|
||||||
|
|
Ładowanie…
Reference in New Issue