friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

"term" replaced with "tag"

This commit is contained in:
Michael 2020-05-01 08:02:21 +00:00
parent 1f64e672ba
commit 8602bbb3b9
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Content/Widget/TagCloud.php
View File

@ -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]);

4
src/Module/Profile/Status.php
View File

@ -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)) {