X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=38f4a58fba4bfb3b1e157c78fa9b5e0fb66baea1;hb=b837c487c5ead3228298d7e96f9e096457829488;hp=f4bab4b8fc9f4edc206071976a750f969d78c8f2;hpb=13a10b8f20ac7c5927c39d9e80e1a7d515385736;p=friendica.git

diff --git a/include/items.php b/include/items.php
index f4bab4b8fc..38f4a58fba 100644
--- a/include/items.php
+++ b/include/items.php
@@ -103,8 +103,7 @@ function add_page_info_data(array $data, $no_photos = false)
 		$hashtags = "\n";
 		foreach ($data["keywords"] as $keyword) {
 			/// @TODO make a positive list of allowed characters
-			$hashtag = str_replace([" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"],
-						["", "", "", "", "", "", "", "", "", "", "", ""], $keyword);
+			$hashtag = str_replace([' ', '+', '/', '.', '#', '@', "'", '"', '’', '`', '(', ')', '„', '“'], '', $keyword);
 			$hashtags .= "#[url=" . DI::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url] ";
 		}
 	}
@@ -142,25 +141,22 @@ function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklis
 	return $data;
 }
 
-function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blacklist = "")
+function get_page_keywords($url, $photo = "", $keywords = false, $keyword_blacklist = "")
 {
 	$data = query_page_info($url, $photo, $keywords, $keyword_blacklist);
+	if (empty($data["keywords"]) || !is_array($data["keywords"])) {
+		return [];
+	}
 
-	$tags = "";
-	if (isset($data["keywords"]) && count($data["keywords"])) {
-		foreach ($data["keywords"] as $keyword) {
-			$hashtag = str_replace([" ", "+", "/", ".", "#", "'"],
-				["", "", "", "", "", ""], $keyword);
-
-			if ($tags != "") {
-				$tags .= ", ";
-			}
+	$taglist = [];
+	foreach ($data['keywords'] as $keyword) {
+		$hashtag = str_replace([" ", "+", "/", ".", "#", "'"],
+			["", "", "", "", "", ""], $keyword);
 
-			$tags .= "#[url=" . DI::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]";
-		}
+		$taglist[] = $hashtag;
 	}
 
-	return $tags;
+	return $taglist;
 }
 
 function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "")