From: Michael <heluecht@pirati.ca>
Date: Fri, 1 May 2020 08:02:21 +0000 (+0000)
Subject: "term" replaced with "tag"
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8602bbb3b9a017004ac42c4b131d687f61d10ace;p=friendica.git

"term" replaced with "tag"
---

diff --git a/src/Content/Widget/TagCloud.php b/src/Content/Widget/TagCloud.php
index 63df5a0bd5..49157a5bdd 100644
--- a/src/Content/Widget/TagCloud.php
+++ b/src/Content/Widget/TagCloud.php
@@ -102,16 +102,13 @@ class TagCloud
 		}
 
 		// Fetch tags
-		$tag_stmt = DBA::p("SELECT `term`, COUNT(`term`) AS `total` FROM `term`
-			LEFT JOIN `item` ON `term`.`oid` = `item`.`id`
-			WHERE `term`.`uid` = ? AND `term`.`type` = ?
-			AND `term`.`otype` = ?
+		$tag_stmt = DBA::p("SELECT `name`, COUNT(`name`) AS `total` FROM `tag-search-view`
+			LEFT JOIN `item` ON `tag-search-view`.`uri-id` = `item`.`uri-id`
+			WHERE `tag-search-view`.`uid` = ?
 			AND `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 			$sql_options
-			GROUP BY `term` ORDER BY `total` DESC $limit",
-			$uid,
-			$type,
-			Term::OBJECT_TYPE_POST
+			GROUP BY `name` ORDER BY `total` DESC $limit",
+			$uid
 		);
 		if (!DBA::isResult($tag_stmt)) {
 			return [];
@@ -140,7 +137,7 @@ class TagCloud
 		}
 
 		foreach ($arr as $rr) {
-			$tags[$x][0] = $rr['term'];
+			$tags[$x][0] = $rr['name'];
 			$tags[$x][1] = log($rr['total']);
 			$tags[$x][2] = 0;
 			$min = min($min, $tags[$x][1]);
diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index d7ed5ca7f4..f12889c9f9 100644
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -148,8 +148,8 @@ class Status extends BaseProfile
 		}
 
 		if (!empty($hashtags)) {
-			$sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-				DBA::escape(Strings::protectSprintf($hashtags)), intval(Term::OBJECT_TYPE_POST), intval(Tag::HASHTAG), intval($a->profile['uid']));
+			$sql_post_table .= sprintf("INNER JOIN (SELECT `uri-id` FROM `tag-search-view` WHERE `name` = '%s' AND `uid` = %d ORDER BY `uri-id` DESC) AS `tag-search` ON `item`.`uri-id` = `tag-search`.`uri-id` ",
+				DBA::escape(Strings::protectSprintf($hashtags)), intval($a->profile['uid']));
 		}
 
 		if (!empty($datequery)) {