X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FPageInfo.php;h=d3b38336b5d790baeaec023fbb22fa7266f2397a;hb=68046573a4171dcbd5db75a991487bafa4b4370f;hp=7226ff2a445b55075989faf8f2d21c147b85c52c;hpb=f25c3f4619182f363ba87d738d6eb61fb6985ae6;p=friendica.git

diff --git a/src/Content/PageInfo.php b/src/Content/PageInfo.php
index 7226ff2a44..d3b38336b5 100644
--- a/src/Content/PageInfo.php
+++ b/src/Content/PageInfo.php
@@ -253,10 +253,15 @@ class PageInfo
 		// Fix for Mastodon where the mentions are in a different format
 		$body = preg_replace("~\[url=($URLSearchString)]([#!@])(.*?)\[/url]~is", '$2[url=$1]$3[/url]', $body);
 
-		preg_match("~(?<![!#@])\[url]($URLSearchString)\[/url]$~is", $body, $matches);
+		// Remove all hashtags and mentions
+		$body = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '', $body);
+
+		// Search for pure links
+		preg_match("/\[url\](https?:.*?)\[\/url\]/ism", $body, $matches);
 
 		if (!$matches) {
-			preg_match("~(?<![!#@])\[url=($URLSearchString)].*\[/url]$~is", $body, $matches);
+			// Search for links with descriptions
+			preg_match("/\[url\=(https?:.*?)\].*?\[\/url\]/ism", $body, $matches);
 		}
 
 		if (!$matches && $searchNakedUrls) {