Merge remote-tracking branch 'upstream/develop' into no-term2

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 4c7551e5c49f0a565a4b7b75dfde9339472b1d2a..38f4a58fba4bfb3b1e157c78fa9b5e0fb66baea1 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -141,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 = "")