From 43f98bc8542867ba3b098d8c6ba498b248d83286 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 4 Jul 2015 23:49:52 +0200
Subject: [PATCH] When posting to Diaspora, now the contact names are
 containing the link to the user profile.

---
 include/bbcode.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index 6c5a400ddc..e872d859c5 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -887,8 +887,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	$MAILSearchString = $URLSearchString;
 
 	// Remove all hashtag addresses
-	if ((!$tryoembed OR $simplehtml) AND ($simplehtml != 7))
+	if ((!$tryoembed OR $simplehtml) AND !in_array($simplehtml, array(3, 7)))
 		$Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
+	elseif ($simplehtml == 3)
+		$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+			'$1<a href="$2">$3</a>',
+			$Text);
 	elseif ($simplehtml == 7)
 		$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
 			'$1<span class="vcard"><a href="$2" class="url" title="$3"><span class="fn nickname mention">$3</span></a></span>',