From 1c640902177afad3dfe3d38db723414ff47a8a01 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 28 Nov 2015 14:29:14 +0100 Subject: [PATCH] Avoid duplicated tags --- include/bb2diaspora.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index fc05e720f4..a8b39f741a 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -83,7 +83,6 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { 'return \'#\'. str_replace(\' \', \'_\', $match[2]);' ), $Text); - // 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); @@ -94,11 +93,12 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { // Add all tags that maybe were removed if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$OriginalText, $tags)) { $tagline = ""; - foreach($tags[2] as $tag) - if (!strpos($Text, "#".$tag)) + foreach($tags[2] as $tag) { + $tag = html_entity_decode($tag, ENT_QUOTES, 'UTF-8'); + if (!strpos(html_entity_decode($Text, ENT_QUOTES, 'UTF-8'), "#".$tag)) $tagline .= "#".$tag." "; - - $Text = $Text."
".$tagline; + } + $Text = $Text." ".$tagline; } } else