X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FTerm.php;h=868f2bf0532380ee8bef06655f8e5e8bd6a594df;hb=7b7132971a64a92a685a5fd860fe4709dce1765a;hp=6e92c9ce18d03a224fb8928f808e89c30f933d59;hpb=01640a7045e146759bc936dd499ac27738b78940;p=friendica.git
diff --git a/src/Model/Term.php b/src/Model/Term.php
index 6e92c9ce18..868f2bf053 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -82,7 +82,7 @@ class Term
WHERE `thread`.`visible`
AND NOT `thread`.`deleted`
AND NOT `thread`.`moderated`
- AND NOT `thread`.`private`
+ AND `thread`.`private` = ?
AND t.`uid` = 0
AND t.`otype` = ?
AND t.`type` = ?
@@ -91,6 +91,7 @@ class Term
GROUP BY `term`
ORDER BY `score` DESC
LIMIT ?",
+ Item::PUBLIC,
Term::OBJECT_TYPE_POST,
Term::HASHTAG,
$period,
@@ -122,11 +123,10 @@ class Term
FROM `term` t
JOIN `item` i ON i.`id` = t.`oid` AND i.`uid` = t.`uid`
JOIN `thread` ON `thread`.`iid` = i.`id`
- JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
WHERE `thread`.`visible`
AND NOT `thread`.`deleted`
AND NOT `thread`.`moderated`
- AND NOT `thread`.`private`
+ AND `thread`.`private` = ?
AND `thread`.`wall`
AND `thread`.`origin`
AND t.`otype` = ?
@@ -136,6 +136,7 @@ class Term
GROUP BY `term`
ORDER BY `score` DESC
LIMIT ?",
+ Item::PUBLIC,
Term::OBJECT_TYPE_POST,
Term::HASHTAG,
$period,
@@ -462,13 +463,13 @@ class Term
$item['body'] = str_replace($orig_tag, $tag['url'], $item['body']);
}
- $return['hashtags'][] = $prefix . '' . htmlspecialchars($tag['term']) . '';
- $return['tags'][] = $prefix . '' . htmlspecialchars($tag['term']) . '';
+ $return['hashtags'][] = $prefix . '' . htmlspecialchars($tag['term']) . '';
+ $return['tags'][] = $prefix . '' . htmlspecialchars($tag['term']) . '';
break;
case self::MENTION:
$tag['url'] = Contact::magicLink($tag['url']);
- $return['mentions'][] = $prefix . '' . htmlspecialchars($tag['term']) . '';
- $return['tags'][] = $prefix . '' . htmlspecialchars($tag['term']) . '';
+ $return['mentions'][] = $prefix . '' . htmlspecialchars($tag['term']) . '';
+ $return['tags'][] = $prefix . '' . htmlspecialchars($tag['term']) . '';
break;
case self::IMPLICIT_MENTION:
$return['implicit_mentions'][] = $prefix . $tag['term'];